Commit Graph

751 Commits

Author SHA1 Message Date
Anton Georgiev
6f8abff77c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4 2017-10-21 08:50:25 -04:00
Anton Georgiev
325a6ef8f2 show presenter group in pod dropdown 2017-10-21 08:03:52 -04:00
Anton Georgiev
030567368a add/remove user from presenter groups 2017-10-20 17:01:57 -04:00
Richard Alam
afb217fe70 Merge branch 'remove-reconnect-handler' of https://github.com/ritzalam/bigbluebutton into ritzalam-remove-reconnect-handler 2017-10-20 08:11:49 -07:00
Richard Alam
ec35eed07c Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton 2017-10-20 08:10:43 -07:00
Richard Alam
333dba585b - remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
the meeting is being records, the audio conference fails to record.
2017-10-20 07:38:50 -07:00
Richard Alam
cfec9de678 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into update-with-20 2017-10-19 18:20:25 -07:00
Richard Alam
11f0bdf0ac Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4 2017-10-19 17:46:35 -07:00
Richard Alam
e01692c40b - send voice conf started and destroyed message 2017-10-19 17:18:50 -07:00
Richard Alam
a3530cad91 - remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
the meeting is being records, the audio conference fails to record.
2017-10-19 12:59:14 -07:00
Anton Georgiev
04cef71384 re-enable next/prev/goto slide 2017-10-19 14:47:59 -04:00
Richard Alam
a548af00f7 - format 2017-10-18 10:11:56 -07:00
Richard Alam
8070821068 Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into implement-multi-chat 2017-10-18 10:09:54 -07:00
Richard Alam
cbd82ffa29 - simplify sending of message 2017-10-18 10:07:54 -07:00
Anton Georgiev
56cdecf152 add presentation into state 2017-10-18 11:46:33 -04:00
Richard Alam
313440abdd - send an eject message to the client so client doesn't attempt to auto-reconnect 2017-10-17 15:01:10 -07:00
Richard Alam
a5ddf0b203 - setup layered handler traits for rights management 2017-10-17 13:57:57 -07:00
Richard Alam
55e371fce2 - layer rights management traits 2017-10-17 12:37:22 -07:00
Richard Alam
4a48a69c7f - start implementing rights management 2017-10-17 11:41:05 -07:00
Richard Alam
5c765072c4 - start implementing rights management 2017-10-16 14:32:05 -07:00
Richard Alam
11c7287d26 - don't force changing listen only status on mute and talking events 2017-10-12 15:36:19 -07:00
Richard Alam
73493f1345 - change how we handle listen only for html5 user 2017-10-12 15:33:22 -07:00
Richard Alam
680a538596 - do not set listenOnly status when receiving user joined voice event from FS as
HTML5 client connects with no mic
2017-10-12 14:41:12 -07:00
Richard Alam
b87adb98fb - fix passing of guest policy through create api 2017-10-03 14:45:32 -07:00
Richard Alam
2958095b32 - create private and public chats 2017-10-03 13:42:24 -07:00
Richard Alam
04ae60f6aa - fix determining of guest status 2017-10-03 11:01:48 -07:00
Richard Alam
058751c3f2 Merge branch 'pods_vol3' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol3 2017-10-03 08:44:26 -07:00
Anton Georgiev
301003bc2d cleanup 2017-10-03 11:43:16 -04:00
Richard Alam
ac599366be - remove akka http prototype as redis scala is incompatible with the latest akka release 2017-10-03 08:36:18 -07:00
Anton Georgiev
d521b19623 Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into pods_vol3 2017-10-03 11:13:48 -04:00
Anton Georgiev
0866bc01ce independent pods, visible slide on presenter side 2017-10-03 11:06:54 -04:00
Richard Alam
a3ad18347e Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat 2017-10-02 18:28:02 -07:00
Richard Alam
8ae38b6f5a - format 2017-10-02 18:01:33 -07:00
Richard Alam
fb72db4c8d - open new public chat window 2017-10-02 11:04:11 -07:00
Ghazi Triki
ab93ae6c22 Fix send breakout room join url for late joiners. 2017-10-02 18:56:36 +01:00
Richard Alam
b71aaed133 - open multi chat windows 2017-10-02 08:30:20 -07:00
Richard Alam
398e6f7a02 - try opening windows 2017-10-01 17:29:44 -07:00
Anton Georgiev
60904989b3 work on set presentation (client + akka apps) 2017-10-01 09:50:12 -04:00
Anton Georgiev
23dadc5477 work on separating pods - client/conversion/apps 2017-09-29 18:20:33 -04:00
Richard Alam
6e6bdd908c - handle guest approval 2017-09-28 17:57:06 -07:00
Richard Alam
e849e1b5ee - approve guest user 2017-09-28 16:56:33 -07:00
Richard Alam
fe44a79298 - send guest waiting message to client 2017-09-27 12:48:30 -07:00
Richard Alam
8e7670c81d - handle guest policy 2017-09-27 11:16:14 -07:00
Anton Georgiev
6d4fa587c8 work on add and remove presentation pods 2017-09-25 14:58:11 -04:00
Richard Alam
4717a53182 - start implementing guest policy 2017-09-22 14:24:08 -07:00
Richard Alam
5c2e12f04f - display chat history 2017-09-21 14:13:42 -07:00
Anton Georgiev
9283c342b7 add a default presentation pod on present module load 2017-09-21 15:30:39 -04:00
Anton Georgiev
9c92780ddb added presentation pod models 2017-09-20 16:58:04 -04:00
Richard Alam
e651785a4e - handle group chat created msg on client 2017-09-20 11:59:33 -07:00
Richard Alam
ff23e66220 - implement create group chat handler 2017-09-20 09:04:00 -07:00