Commit Graph

22 Commits

Author SHA1 Message Date
Anton Georgiev
47cee3138f use UPSERT for chat messages too 2015-10-30 21:27:56 +00:00
Anton Georgiev
e89c37f8ae lock settings - missed these 2015-10-28 16:00:55 +00:00
Maxim Khlobystov
d8ecfd8e04 Added the ability to set emoji status. 2015-10-01 12:41:43 -07:00
Oleksandr Zhurbenko
cd9625dd84 Putting everything in order 2015-08-16 15:19:43 -07:00
Oleksandr Zhurbenko
a813298e56 Small corrections 2015-07-27 16:35:27 -07:00
Oleksandr Zhurbenko
10be3d03e0 Added permissions for viewers and a presenter. Viewers can't retreive the total number of votes. Also, viewers can't retreive any data if they have voted already 2015-07-27 15:55:29 -07:00
Oleksandr Zhurbenko
fbdc50281c Created a new collection named Polls, able to catch a message and save it there 2015-07-21 16:55:42 -07:00
Anton Georgiev
7110866925 presentation slide switch-permissions 2015-05-06 19:58:25 +00:00
Anton Georgiev
81762d5395 disallow unmuteSelf on lock;single user lock->mute 2015-04-23 20:53:07 +00:00
Anton Georgiev
7a0a1dae60 revert server side permission change 2015-04-23 15:46:52 +00:00
Anton Georgiev
073977a92a reorganize the joinAudio button handle; add fields for the permissions for joinAudioWithMic 2015-04-22 19:53:05 +00:00
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
fdbc62ccd1 Cherry pick Anton's server side listen only. Fix conflicts 2015-04-06 05:10:56 -07:00
Anton Georgiev
1db332572c cleaning up 2015-04-02 15:22:08 +00: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
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