Anton Georgiev
5e99ec98c1
Merge branch 'master' into lock-settings
...
Conflicts:
bigbluebutton-html5/app/client/views/chat/chat_bar.html
bigbluebutton-html5/app/server/user_permissions.coffee
2015-04-22 14:50:30 +00:00
Anton Georgiev
fa4cd71ff4
publishing to redis channel "meeting" instead of handling the event on channel "voice"
2015-04-16 19:06:04 +00:00
perroned
59b02e3b2f
Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call
2015-04-15 05:49:32 -07:00
perroned
19816f060e
avoid conflict
2015-04-13 04:08:03 -07:00
Anton Georgiev
7a13d10b91
improve handling of user_joined_voice_message
2015-04-10 18:01:45 +00:00
Anton Georgiev
5446539929
The upsert check was incorrect, checking for exact structure. Split into findOne + insert
2015-04-06 20:00:44 +00:00
Anton Georgiev
fdbc62ccd1
Cherry pick Anton's server side listen only. Fix conflicts
2015-04-06 05:10:56 -07:00
Anton Georgiev
4520949a28
the updated mongo has a slightly stricter rule regarding cursors. The welcome message was not stored correctly
2015-04-02 21:42:35 +00:00
Anton Georgiev
cdba908eea
server side listenOnly. temporarily hooked to raiseHand
2015-04-02 20:11:09 +00:00
Anton Georgiev
1db332572c
cleaning up
2015-04-02 15:22:08 +00:00
perroned
1efc317fcc
public server method for joining as listen only
2015-04-02 08:07:58 -07:00
perroned
4c72b7f2fa
Update field in payload
2015-04-02 08:06:39 -07:00
perroned
38fbe35b94
Grant permission for joining listen only
2015-04-02 08:05:43 -07:00
Anton Georgiev
06d5087bfb
unlock if presenter; completely disable locked chat input
2015-03-31 18:42:42 +00:00
Anton Georgiev
d3b459feec
locking for private chat
2015-03-31 17:25:05 +00:00
Anton Georgiev
7b3d6497c2
locking for public chat
2015-03-30 22:48:25 +00:00
Anton Georgiev
b47e8f3330
lock settings - handle new_permission_settings, user_locked_message
2015-03-30 17:49:30 +00:00
Anton Georgiev
2dcc67873b
Merge branch 'master' into ip-independent-logouturl
2015-03-10 19:19:18 +00:00
Anton Georgiev
ce79fb0cdc
make the [default] logoutURL for the html5 client IP independent
2015-03-09 21:25:30 +00:00
Anton Georgiev
5ebb2f5f3c
Allow moderators to use the html5 client.
...
Temporarily they will have exactly the same permissions as viewers do.
This commit's goal is to facilitate the redirect to the html5 client in the event that Flash is not detected on the system
2015-03-06 20:53:13 +00:00
Anton Georgiev
d830e3358d
move the HTML5 client code outside of labs
2015-03-05 17:55:23 +00:00
