Commit 50df25e0 authored 7 years ago by Richard Alam

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

parents 73a3cbe8 7d10ac1a

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PermissionCheck.scala 5 additions, 6 deletions

...n/scala/org/bigbluebutton/core/apps/PermissionCheck.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PresentationModel.scala 0 additions, 66 deletions

...scala/org/bigbluebutton/core/apps/PresentationModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ClearPublicChatHistoryPubMsgHdlr.scala 11 additions, 3 deletions

...ton/core/apps/chat/ClearPublicChatHistoryPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/BroadcastLayoutMsgHdlr.scala 12 additions, 4 deletions

...gbluebutton/core/apps/layout/BroadcastLayoutMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/meeting/ValidateConnAuthTokenSysMsgHdlr.scala 30 additions, 0 deletions

...n/core/apps/meeting/ValidateConnAuthTokenSysMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/GetCurrentPollReqMsgHdlr.scala 4 additions, 3 deletions

...bluebutton/core/apps/polls/GetCurrentPollReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/ShowPollResultReqMsgHdlr.scala 4 additions, 3 deletions

...bluebutton/core/apps/polls/ShowPollResultReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/StartCustomPollReqMsgHdlr.scala 4 additions, 3 deletions

...luebutton/core/apps/polls/StartCustomPollReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/StartPollReqMsgHdlr.scala 4 additions, 3 deletions

...g/bigbluebutton/core/apps/polls/StartPollReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/StopPollReqMsgHdlr.scala 5 additions, 8 deletions

...rg/bigbluebutton/core/apps/polls/StopPollReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp2x.scala 0 additions, 36 deletions

...bluebutton/core/apps/presentation/PresentationApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/ResizeAndMovePagePubMsgHdlr.scala 0 additions, 34 deletions

.../core/apps/presentation/ResizeAndMovePagePubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/CreateNewPresentationPodPubMsgHdlr.scala 36 additions, 30 deletions

.../presentationpod/CreateNewPresentationPodPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/GetAllPresentationPodsReqMsgHdlr.scala 23 additions, 14 deletions

...ps/presentationpod/GetAllPresentationPodsReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/GetPresentationInfoReqMsgHdlr.scala 36 additions, 27 deletions

.../apps/presentationpod/GetPresentationInfoReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionCompletedSysPubMsgHdlr.scala 0 additions, 2 deletions

...ionpod/PresentationConversionCompletedSysPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionUpdatePubMsgHdlr.scala 35 additions, 0 deletions

...sentationpod/PresentationConversionUpdatePubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageCountErrorPubMsgHdlr.scala 7 additions, 5 deletions

...resentationpod/PresentationPageCountErrorPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageGeneratedPubMsgHdlr.scala 7 additions, 7 deletions

...presentationpod/PresentationPageGeneratedPubMsgHdlr.scala

with 224 additions and 254 deletions

Please register or to comment