Commit 08fe6cea authored 7 years ago by Richard Alam

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

parents f2eebff8 17212d93

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 16 additions, 58 deletions

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomEndedMsgHdlr.scala 5 additions, 14 deletions

...ebutton/core/apps/breakout/BreakoutRoomEndedMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 7 additions, 1 deletion

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 10 additions, 4 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/EndMeetingSysCmdMsgHdlr.scala 0 additions, 50 deletions

...tton/core2/message/handlers/EndMeetingSysCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/meeting/CreateMeetingReqMsgHdlr.scala 5 additions, 0 deletions

...e2/message/handlers/meeting/CreateMeetingReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/meeting/DestroyMeetingSysCmdMsgHdlr.scala 39 additions, 0 deletions

...essage/handlers/meeting/DestroyMeetingSysCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/meeting/EndMeetingSysCmdMsgHdlr.scala 25 additions, 0 deletions

...e2/message/handlers/meeting/EndMeetingSysCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserConnectedToGlobalAudioMsgHdlr.scala 4 additions, 5 deletions

...ge/handlers/users/UserConnectedToGlobalAudioMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/users/UserDisconnectedFromGlobalAudioMsgHdlr.scala 4 additions, 5 deletions

...ndlers/users/UserDisconnectedFromGlobalAudioMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala 32 additions, 1 deletion

.../org/bigbluebutton/core2/message/senders/MsgBuilder.scala
bbb-apps-common/src/main/scala/org/bigbluebutton/client/MsgToClientJsonActor.scala 2 additions, 2 deletions

...scala/org/bigbluebutton/client/MsgToClientJsonActor.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala 37 additions, 17 deletions

...ain/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala 14 additions, 0 deletions

.../scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java 6 additions, 81 deletions

...java/org/bigbluebutton/voiceconf/messaging/Constants.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageBuilder.java 41 additions, 18 deletions

...org/bigbluebutton/voiceconf/messaging/MessageBuilder.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java 1 addition, 1 deletion

...rg/bigbluebutton/voiceconf/messaging/MessageReceiver.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessagingConstants.java 2 additions, 26 deletions

...bigbluebutton/voiceconf/messaging/MessagingConstants.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java 4 additions, 4 deletions

...bluebutton/voiceconf/messaging/RedisMessagingService.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/messages/UserConnectedToGlobalAudio.java 8 additions, 41 deletions

...ceconf/messaging/messages/UserConnectedToGlobalAudio.java

with 262 additions and 328 deletions

Please register or to comment