-
- Downloads
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into try-to-cleanup-connection
Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
Showing
- akka-bbb-apps/build.sbt 1 addition, 1 deletionakka-bbb-apps/build.sbt
- akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java 28 additions, 27 deletions...ebutton/core/pubsub/receivers/MeetingMessageReceiver.java
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 21 additions, 21 deletions...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 3 additions, 1 deletion...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageDecoder.scala 2 additions, 2 deletions...ain/scala/org/bigbluebutton/core/JsonMessageDecoder.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala 15 additions, 15 deletions...scala/org/bigbluebutton/core/JsonMessageSenderActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala 12 additions, 12 deletions...s/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala 2 additions, 2 deletions.../src/main/scala/org/bigbluebutton/core/MeetingActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala 7 additions, 6 deletions.../src/main/scala/org/bigbluebutton/core/MeetingModel.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala 0 additions, 1 deletion...ain/scala/org/bigbluebutton/core/MessageSenderActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala 6 additions, 7 deletions...apps/src/main/scala/org/bigbluebutton/core/Protocol.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/ProtocolMessages.scala 4 additions, 5 deletions.../main/scala/org/bigbluebutton/core/ProtocolMessages.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala 2 additions, 0 deletions...src/main/scala/org/bigbluebutton/core/api/Constants.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala 16 additions, 19 deletions...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala 9 additions, 9 deletions...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala 43 additions, 45 deletions...n/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala 15 additions, 12 deletions...scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala 11 additions, 7 deletions...n/core/pubsub/senders/MeetingMessageToJsonConverter.scala
- akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala 8 additions, 4 deletions.../test/scala/org/bigbluebutton/core/AppsTestFixtures.scala
- akka-bbb-apps/src/test/scala/org/bigbluebutton/core/apps/BreakoutRoomsUtilSpec.scala 1 addition, 8 deletions...a/org/bigbluebutton/core/apps/BreakoutRoomsUtilSpec.scala
Loading
Please register or sign in to comment