Maxim Khlobystov
|
461ae08280
|
Added the ability to distinguish between moderator and attendee.
|
2014-10-27 19:19:56 -07:00 |
|
perroned
|
ce41c6798d
|
Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth
Conflicts:
labs/meteor-client/app/client/views/whiteboard/slide.coffee
labs/meteor-client/app/server/collection_methods/users.coffee
|
2014-10-16 06:15:13 -07:00 |
|
Anton Georgiev
|
61da2885a9
|
fixes for isCurrentUserTalking
|
2014-10-14 22:38:15 +00:00 |
|
Anton Georgiev
|
b1818b9258
|
update for ListenOnly
|
2014-10-14 20:23:06 +00:00 |
|
Anton Georgiev
|
e0ac793255
|
update the talking check
|
2014-10-14 16:55:39 +00:00 |
|
perroned
|
b043b194b1
|
Removing presenter functionality from this viewer branch.
|
2014-10-14 08:51:08 -07:00 |
|
Anton Georgiev
|
d65bfa8f55
|
recovered some functionality for audio (resulting in icons displaying in the html userlist). still have work to do
|
2014-10-10 21:35:51 +00:00 |
|
Anton Georgiev
|
846a59d4c8
|
Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth
|
2014-10-07 19:52:51 +00:00 |
|
Anton Georgiev
|
319a1247a1
|
Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth
Conflicts:
labs/meteor-client/app/client/globals.coffee
labs/meteor-client/app/client/views/chat/chat_bar.coffee
labs/meteor-client/app/collections/chat.coffee
labs/meteor-client/app/collections/meetings.coffee
labs/meteor-client/app/collections/presentations.coffee
labs/meteor-client/app/collections/shapes.coffee
labs/meteor-client/app/collections/slides.coffee
labs/meteor-client/app/collections/users.coffee
|
2014-10-07 17:45:47 +00:00 |
|
Anton Georgiev
|
3905e45de7
|
moving the meteor files into an app folder so that grunt can reside in the root without breaking meteor
|
2014-10-02 16:16:34 +00:00 |
|