Unverified Commit 2b859079 authored 5 years ago by Richard Alam Committed by GitHub 5 years ago

Merge pull request #8376 from bigbluebutton/master

Branching off 2.2.x so we can start using 'master' for next release(s)

parents a20277a6 b3a37d42

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.github/ISSUE_TEMPLATE/html5-issue.md 10 additions, 0 deletions

.github/ISSUE_TEMPLATE/html5-issue.md
akka-bbb-apps/.gitignore 2 additions, 0 deletions

akka-bbb-apps/.gitignore
akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala 5 additions, 0 deletions

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 2 additions, 2 deletions

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutHdlrHelpers.scala 31 additions, 11 deletions

...igbluebutton/core/apps/breakout/BreakoutHdlrHelpers.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomCreatedMsgHdlr.scala 11 additions, 4 deletions

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

...core/apps/breakout/RequestBreakoutJoinURLReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/SendBreakoutUsersUpdateMsgHdlr.scala 4 additions, 1 deletion

...n/core/apps/breakout/SendBreakoutUsersUpdateMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PdfConversionInvalidErrorSysPubMsgHdlr.scala 36 additions, 0 deletions

...sentationpod/PdfConversionInvalidErrorSysPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPodHdlrs.scala 1 addition, 0 deletions

...tton/core/apps/presentationpod/PresentationPodHdlrs.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala 2 additions, 0 deletions

...re/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/GetLockSettingsReqMsgHdlr.scala 8 additions, 3 deletions

...luebutton/core/apps/users/GetLockSettingsReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala 19 additions, 5 deletions

...rg/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserConnectedToGlobalAudioMsgHdlr.scala 13 additions, 2 deletions

...n/core/apps/users/UserConnectedToGlobalAudioMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserJoinMeetingAfterReconnectReqMsgHdlr.scala 4 additions, 4 deletions

.../apps/users/UserJoinMeetingAfterReconnectReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserJoinMeetingReqMsgHdlr.scala 4 additions, 4 deletions

...luebutton/core/apps/users/UserJoinMeetingReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala 17 additions, 50 deletions

...utton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserLeftVoiceConfEvtMsgHdlr.scala 4 additions, 4 deletions

...ebutton/core/apps/voice/UserLeftVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserMutedInVoiceConfEvtMsgHdlr.scala 10 additions, 24 deletions

...tton/core/apps/voice/UserMutedInVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserStatusVoiceConfEvtMsgHdlr.scala 21 additions, 0 deletions

...utton/core/apps/voice/UserStatusVoiceConfEvtMsgHdlr.scala

with 213 additions and 116 deletions

Please register or to comment