Commit 76f42d42 authored 7 years ago by Anton Georgiev

Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into...

Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into late-joiner-webrtc-screenshare-updates

parents 0c894118 e35f2fd1

Hide whitespace changes

Inline Side-by-side

Showing

README.md 2 additions, 2 deletions

README.md
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java 1 addition, 27 deletions

...n/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/LockMessageReceiver.java 0 additions, 44 deletions

...bluebutton/core/pubsub/receivers/LockMessageReceiver.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java 0 additions, 13 deletions

...ebutton/core/pubsub/receivers/MeetingMessageReceiver.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java 0 additions, 3 deletions

...luebutton/core/pubsub/receivers/RedisMessageReceiver.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java 0 additions, 140 deletions

...luebutton/core/pubsub/receivers/UsersMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala 2 additions, 7 deletions

akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 31 additions, 62 deletions

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 4 additions, 157 deletions

...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageRecorder.scala 0 additions, 11 deletions

...c/main/scala/org/bigbluebutton/core/MessageRecorder.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala 17 additions, 165 deletions

...ain/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/OutMessageGateway.scala 2 additions, 5 deletions

...main/scala/org/bigbluebutton/core/OutMessageGateway.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/OutMessageGatewayImp.scala 5 additions, 13 deletions

...n/scala/org/bigbluebutton/core/OutMessageGatewayImp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala 8 additions, 38 deletions

...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala 2 additions, 31 deletions

...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/GuestsApp.scala 3 additions, 2 deletions

...rc/main/scala/org/bigbluebutton/core/apps/GuestsApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomCreatedMsgHdlr.scala 2 additions, 3 deletions

...utton/core/apps/breakout/BreakoutRoomCreatedMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomEndedMsgHdlr.scala 2 additions, 3 deletions

...ebutton/core/apps/breakout/BreakoutRoomEndedMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomUsersUpdateMsgHdlr.scala 2 additions, 3 deletions

...n/core/apps/breakout/BreakoutRoomUsersUpdateMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomsListMsgHdlr.scala 2 additions, 3 deletions

...ebutton/core/apps/breakout/BreakoutRoomsListMsgHdlr.scala

with 85 additions and 732 deletions

Please register or to comment