Commit Graph

11172 Commits

Author SHA1 Message Date
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
091b50d67a Added missing setter top BreakoutRoomService.java 2015-11-06 10:39:12 +01:00
Ghazi Triki
0de3e3dd43 Added BreakoutRoomService with createBreakoutRooms method. 2015-11-05 21:44:24 +01:00
Ghazi Triki
0bf3fc7677 Create breakout rooms request sent via UserService. 2015-11-05 18:35:11 +01:00
Ghazi Triki
5a11eeebe3 bbb-video/build.gradle and bigbluebutton-apps/build.gradle uses the latest SNAPSHOT version of bbb-common-message 2015-11-05 18:34:41 +01:00
Ghazi Triki
fad585051b akka-bbb-fsesl/build.sbt uses bbb-common-message 0.0.16-SNAPSHOT 2015-11-03 21:51:21 +01:00
Ghazi Triki
b3951dc4af Added bin folder to bigbluebutton-web/.gitignore 2015-11-03 21:49:21 +01:00
Ghazi Triki
c9e521a551 Merge remote-tracking branch 'ritzalam/try-using-event-bus' into breakout-rooms 2015-11-03 21:40:30 +01:00
Richard Alam
5c6ab0422e - fix compile issue 2015-11-03 20:14:40 +00:00
Ghazi Triki
3aa8bf3430 Merge remote-tracking branch 'ritzalam/try-using-event-bus' into breakout-rooms 2015-11-03 17:48:59 +01:00
Richard Alam
83934862fc - tell parent meeting that breakout room has been created 2015-10-30 21:28:01 +00:00
Richard Alam
ea2dbd541a - breakout room incoming message 2015-10-30 21:08:13 +00:00
Richard Alam
923d78719b - send messages to redis 2015-10-30 19:14:35 +00:00
Richard Alam
48e5f5f638 - formatting cleanup 2015-10-29 21:43:49 +00:00
Richard Alam
27f6aa0cfb - implement message handler for breakout rooms 2015-10-29 18:21:38 +00:00
Richard Alam
c224e58d5b - move meeting actor methods into class so it is easier to setup tests 2015-10-28 20:54:31 +00:00
Richard Alam
4154d9e531 - write tests to calculate checksum 2015-10-28 17:05:40 +00:00
Richard Alam
e3fdea517a - increment meeting id 2015-10-28 15:12:35 +00:00
Richard Alam
66eaef9032 - implement create breakout room handler 2015-10-28 15:00:37 +00:00
Ghazi Triki
9d4c0ca0a5 Improved Breakout rooms UI. 2015-10-27 16:49:38 +01:00
Richard Alam
aa15bc220a - add tests 2015-10-27 15:31:14 +00:00
Richard Alam
00e6e2b4db - externalise scheduled timer 2015-10-26 20:45:00 +00:00
Richard Alam
7db6144921 - add tests 2015-10-26 19:00:04 +00:00
Richard Alam
968a2ed98f - rename event bus 2015-10-23 21:08:30 +00:00
Richard Alam
4a10f04f8b - use akka event bus for messages 2015-10-23 19:37:13 +00:00
Richard Alam
75e0b0065a - fix duration 2015-10-23 15:14:46 +00: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
b899eeebcf - distinguish breakout rooms in create meeting request 2015-10-22 19:36:20 +00:00
Richard Alam
cecbc46d1d - create breakout room in bbb-web 2015-10-22 17:13:53 +00:00
Richard Alam
c47272fd2c - refactor how default presentation is downloaded 2015-10-21 20:51:58 +00:00
Richard Alam
9c527be4f0 - fix json response 2015-10-21 18:30:25 +00:00
Richard Alam
a80a0562c5 - return json on create api call 2015-10-21 18:25:00 +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
9d04103225 - start implementing create breakout room 2015-10-21 15:47:49 +00:00
Richard Alam
10f7f3f852 - play around with akka http 2015-10-20 15:43:41 +00:00
Richard Alam
acd021a113 - play around with akka http 2015-10-19 19:00:59 +00:00
Richard Alam
14aabf9da6 - allow joining breakout room 2015-10-19 19:00:21 +00:00
Richard Alam
9696b0246b - add dependencies 2015-10-16 19:23:33 +00:00
Richard Alam
6b1f727117 - add name to test 2015-10-16 14:44:31 +00:00
Richard Alam
3db1299059 - start implementing breakout room messages
- use class to serialize/deserialize JSON
 - add test to message classes
2015-10-15 23:05:19 +00:00
Fred Dixon
b802076f01 Merge pull request #2831 from antobinary/audio-fix
html5 client - update welcome message for 1.0-beta
2015-10-09 13:07:29 -04:00
Richard Alam
fa72b06500 Merge pull request #2826 from riadvice/presentation-upload-status
Presentation upload returns a 200 HTTP status.
2015-10-09 12:48:57 -04:00
Anton Georgiev
35f3266988 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-10-09 15:37:04 +00:00
Anton Georgiev
a3e7721db9 update welcome message 2015-10-09 15:36:56 +00:00
Richard Alam
36fe1b0806 Merge pull request #2830 from ritzalam/allow-changing-loglevels
Allow changing loglevels
2015-10-08 15:14:11 -04:00
Richard Alam
e8e8eb8955 - clean up formatting 2015-10-08 19:10:43 +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
e5ed0e4713 - add logging to trace messages in order to debug lost messages between server to client 2015-10-08 18:27:33 +00:00
Richard Alam
f4d094adc0 - allow changing the debug level without restarting red5 2015-10-08 18:26:22 +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