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

4318 Commits

Author SHA1 Message Date
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
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
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
Ghazi Triki
0bf3fc7677 Create breakout rooms request sent via UserService. 2015-11-05 18:35:11 +01: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
Richard Alam
197669ebc4 - add a timeout when to expect response to validate token. If we don't get a response, 
log it. This might mean that we run into issue where the reply from server isn't
   getting propagated back into the client.
 2015-10-08 18:28:25 +00:00
Richard Alam
c995a7a587 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins 2015-10-08 14:34:02 +00:00
Richard Alam
d89a34209d - make presentation api use session 2015-10-07 21:44:01 +00:00
Richard Alam
c5b5b11725 - check if user has sessionToken 2015-10-07 20:34:37 +00:00
Richard Alam
c182f85403 - use sessionToekn on signOut API call 2015-10-07 16:09:31 +00:00
Anton Georgiev
a38f5b642a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-10-07 15:10:55 +00:00
Anton Georgiev
0f5c19e13b reset userAgent and callerIdName so we can switch between audio joining modes 2015-10-07 15:09:08 +00:00
Richard Alam
7968273501 - pass sessionToken to get configXML from bbb-web 2015-10-06 21:08:01 +00:00
Richard Alam
91fbc8c10c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins 2015-10-06 19:02:52 +00:00
Richard Alam
e53ed90859 Merge pull request #2823 from ritzalam/fix-demo11-api-example 
- convert all external ids in js api into internal user ids as using…
 2015-10-06 15:00:33 -04:00
Richard Alam
a2cf908425 - convert all extarnal ids in js api into internal user ids as using external user ids breaks when 
a user joins twice into the meeting
 2015-10-06 17:57:39 +00:00
Richard Alam
6cf23b5511 - try to figure out why we get into infinite loop when calculating dependencies 2015-10-06 14:45:58 +00:00
Richard Alam
e2533f1f0c - load config.xml first before doing anything else 2015-10-05 20:06:35 +00:00
Chad Pilkey
6f69330b77 Added scrolling dots to the reconnect popup 2015-10-05 12:26:44 -07:00
Richard Alam
83e2d3c146 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins 2015-10-05 16:01:59 +00:00
Richard Alam
c3aa194e00 - update to latest locales (oct 5, 2015) 2015-10-05 15:59:07 +00:00
Richard Alam
50a55481f5 Merge branch 'master' into support-multiple-logins 2015-10-05 15:33:33 +00:00
Richard Alam
f20b919ec2 Merge pull request #2818 from kepstin/ff-41-0-1-hang-workaround 
Workaround Firefox 41.0.1 hang on Windows
 2015-10-05 11:32:43 -04:00
Richard Alam
93ba04ce4c Merge pull request #2814 from capilkey/fix-2810 
Fix 2810
 2015-10-05 11:32:34 -04:00
Calvin Walton
dbd79cebb5 Workaround Firefox 41.0.1 hang on Windows 
On this particular browser, switch the Flash embed window mode to "opaque"
instead of "window". This causes buttons and right-click to be somewhat
unresponsive, but is still better than a complete browser hang.

The browser versions that the workaround is applied to is extremely limited,
because of the sideeffects.
 2015-10-05 11:26:31 -04:00
Richard Alam
3918dd3238 - try to figure out when configXml gets loaded 2015-10-05 15:22:39 +00:00
Chad Pilkey
81ced7193b Only show annotations for the current whiteboard 2015-10-02 15:03:40 -07:00
Chad Pilkey
04ce742fd7 Make sure whiteboard text is published to the correct whiteboardID 2015-10-02 15:02:13 -07:00
Richard Alam
5dd139f2f4 - do not user external user id to find user 2015-09-30 20:07:05 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Ghazi Triki
123bf12798 Updated breakout rooms box style. 2015-09-30 09:27:13 +01:00
Ghazi Triki
6474117fd4 Show the number of users in breakout rooms instead of the room activity. 2015-09-30 09:23:52 +01:00
Ghazi Triki
7565c2277f Display breakout rooms in the users list. 2015-09-29 13:43:46 +01:00
Chad Pilkey
0627afa2e5 Add a default message length to avoid issues of missing property 2015-09-24 14:17:07 -07:00
Chad Pilkey
4c4d35a760 Merge pull request #2787 from riadvice/chat-message-limit 
The use is able to write a multi-line chat message.
 2015-09-24 17:15:43 -04:00