Richard Alam
|
21b8c703a5
|
Merge branch 'breakout-rooms-porto-algre-2015' of https://github.com/riadvice/bigbluebutton into breakout-rooms-porto-algre-2015
Conflicts:
akka-bbb-apps/scala/JsonTest.sc
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala
|
2016-02-01 16:12:06 +00:00 |
|
Ghazi Triki
|
1dd4ddd6cb
|
Created breakout rooms are now displayed in breakout rooms list.
|
2016-01-21 20:09:32 +01:00 |
|
Ghazi Triki
|
058a2170ee
|
Added request breakout rooms list feature.
|
2016-01-15 22:13:53 +01:00 |
|
Ghazi Triki
|
3f049ec644
|
Added more scala worksheet to test breakout room feature.
|
2016-01-13 18:20:51 +01:00 |
|
Richard Alam
|
06029aaba7
|
- figure out enums
|
2015-11-18 11:18:46 -05:00 |
|
Richard Alam
|
bd8b38a22c
|
- use spray json to decode messages
|
2015-11-17 02:11:14 -05:00 |
|