BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,451 Commits 13 Branches 260 Tags 1.1 GiB
c8df5a4ead
Commit Graph

4350 Commits

Author SHA1 Message Date
Ghazi Triki
c8df5a4ead Create breakout rooms item menu should not be displayed when the room is already broken out. 2016-01-22 16:52:34 +01:00
Ghazi Triki
85bb2fd47b Display breakout room users list. 2016-01-22 16:50:19 +01:00
Ghazi Triki
1dd4ddd6cb Created breakout rooms are now displayed in breakout rooms list. 2016-01-21 20:09:32 +01:00
Ghazi Triki
11fefc5c83 isBreakout property in JoinService response should be handled as a boolean not as a string 2016-01-17 20:03:29 +01:00
Ghazi Triki
058a2170ee Added request breakout rooms list feature. 2016-01-15 22:13:53 +01:00
Ghazi Triki
b24ae090b0 Returning isBreakout conference state in join and enter API calls. 2016-01-14 17:15:36 +01:00
Ghazi Triki
b42772c2f4 Fixed remaining time display in the breakout rooms. 2016-01-13 20:18:34 +01:00
Ghazi Triki
3f049ec644 Added more scala worksheet to test breakout room feature. 2016-01-13 18:20:51 +01:00
Ghazi Triki
772e5edb16 End all breakout rooms in client made visible. 2016-01-13 12:14:01 +01:00
Ghazi Triki
48844648ee Send RequestBreakoutJoinUrl from client to server. 2016-01-12 20:18:23 +01:00
Ghazi Triki
b8cb8eba66 Fixed disconnection issue generated by a null error the breakout rooms list. 2016-01-12 16:49:56 +01:00
Ghazi Triki
7b6583461b Fix locale names for breakout room join prompt. 2016-01-12 15:36:13 +01:00
Ghazi Triki
27dcead4d6 Fixed duplicate users and breakout rooms when creating breakout rooms. 2015-11-23 13:42:46 +01:00
Ghazi Triki
78c4045d41 Handled breakout join URL in the client. 2015-11-23 11:50:47 +01:00
Richard Alam
68f9cb8689 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 2015-11-18 03:14:01 -05:00
Ghazi Triki
c27a9baf5b Fixed the number of breakout rooms to create when sending the message from the client. 2015-11-19 16:54:32 -02:00
Richard Alam
0c2a2e6ce1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into breakout-rooms-porto-algre-2015 2015-11-17 23:25:54 -05:00
Chad Pilkey
d1a939b797 Correct the presentation back button enabled check 2015-11-19 09:45:44 -05:00
Chad Pilkey
e8b30b626b Removed three unused polling shortcuts 2015-11-18 07:51:48 -05:00
Ghazi Triki
99b852f69c Better .actionScriptProperties eclipse configuration. 2015-11-18 11:13:25 -02:00
Richard Alam
39d9c5dd15 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
 2015-11-17 02:19:48 -05:00
Ghazi Triki
4e8334d7c3 MessageSender sends json messages for the breakout actions. 2015-11-17 19:09:13 -02:00
Ghazi Triki
6dbd97b138 Breakout rooms datagrid events dispatched from actions column. 2015-11-17 17:30:10 -02:00
Ghazi Triki
b370c36dde Display the number of remaining minutes for the breakout rooms. 2015-11-17 11:33:14 -02:00
Richard Alam
bd8b38a22c - use spray json to decode messages 2015-11-17 02:11:14 -05:00
Ghazi Triki
165b3d6103 Fixed BreakoutRoomSettings style. 2015-11-16 17:32:16 -02:00
Ghazi Triki
402f337fd6 Handle CreateBreakoutRoomsRequest case in BigBlueButtonInGW.scala 2015-11-16 17:09:38 -02:00
Chad Pilkey
8d321b2493 Merge pull request #2849 from riadvice/client-fixes 
Minor Client fixes
 2015-11-16 07:35:39 -05:00
Ghazi Triki
8b1f0d4bae Added EndAllBreakoutRoomsRequest broadcast from client to bigbluebutton-apps. 2015-11-12 22:24:10 +01:00
Ghazi Triki
2914e9105d Handle the incoming message for TimeRemainingUpdate. 2015-11-12 17:08:39 +01:00
Ghazi Triki
d29b8f3b77 - Implemented addBreakoutRoom and updateBreakoutRoomUsers in the Flex client. 
- Created a new BreakoutRoom class.
 2015-11-12 16:05:26 +01:00
Ghazi Triki
3b84120074 Create breakout rooms event parameters are correctly filled from user choices. 2015-11-11 22:18:49 +01:00
Ghazi Triki
423c0c0ecd String localised for the breakout room feature. 2015-11-11 20:25:30 +01:00
Ghazi Triki
f910e95a45 Added more implementations for Breakout Room messages: BreakoutRoomJoinURL, BreakoutRoomStarted, TimeRemainingUpdate and UpdateBreakoutUsers. 2015-11-11 16:47:49 +01:00
Chad Pilkey
8463325ce3 added a client side audio queue when you leave the voice conference 2015-11-09 11:38:30 -08:00
Richard Alam
8f83ada786 - update locales 2015-11-06 21:02:31 +00:00
Chad Pilkey
efd66d2906 blocked video mute/unmute when locked 2015-11-05 14:14:04 -08:00
Ghazi Triki
0bf3fc7677 Create breakout rooms request sent via UserService. 2015-11-05 18:35:11 +01:00
Chad Pilkey
42236569a5 update sip.js to include a ice candidate timeout 2015-11-04 16:44:55 -08:00
Chad Pilkey
03d2a376ad added in a 30s total timeout on iceGathering 2015-11-04 16:44:15 -08:00
Chad Pilkey
f2d997c0bf changed retrived annotation from DrawObject to Object 2015-11-04 13:25:28 -08:00
Ghazi Triki
3aa8bf3430 Merge remote-tracking branch 'ritzalam/try-using-event-bus' into breakout-rooms 2015-11-03 17:48:59 +01:00
Ghazi Triki
9d4c0ca0a5 Improved Breakout rooms UI. 2015-10-27 16:49:38 +01:00
Richard Alam
2b3e38c45b Merge branch 'breakout-rooms' of https://github.com/riadvice/bigbluebutton into breakout-rooms-wip 2015-10-22 19:54:44 +00:00
Richard Alam
c9b4f7e9a0 Merge branch 'support-multiple-logins' into add-http-to-akka-apps 
Conflicts:
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
 2015-10-21 17:44:44 +00:00
Ghazi Triki
083aeb42c8 Improved presentation backButton and forwardButton buttons styles. (reverted from commit eb5371d90c with custom update) 2015-10-20 22:31:48 +01:00
Ghazi Triki
516740bc88 Removed polling shorcuts from ShortcutHelpWindow. 2015-10-19 18:33:33 +01:00
Richard Alam
8beff5f717 Merge pull request #2843 from ritzalam/update-deskhare-jar 
- new jar signed with cert that expires on oct 30, 2017
 2015-10-16 15:48:10 -04:00
Richard Alam
5e190e9578 - new jar signed with cert that expires on oct 30, 2017 2015-10-16 19:47:01 +00:00
Calvin Walton
b4e3561fa6 Update Firefox 41 hang workaround for 41.0.2 2015-10-15 14:05:12 -04:00