Unverified Commit 7d0b350b authored 5 years ago by Richard Alam Committed by GitHub 5 years ago

Merge pull request #8739 from antobinary/merging

Merging 2.2.2 into 'develop'

parents 32c741ce d36c5457

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/project/Dependencies.scala 2 additions, 2 deletions

akka-bbb-apps/project/Dependencies.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala 2 additions, 1 deletion

...on/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PdfConversionInvalidErrorSysPubMsgHdlr.scala 1 addition, 1 deletion

...sentationpod/PdfConversionInvalidErrorSysPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionCompletedSysPubMsgHdlr.scala 22 additions, 23 deletions

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

...esentationpod/PresentationConversionEndedSysMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionUpdatePubMsgHdlr.scala 7 additions, 2 deletions

...sentationpod/PresentationConversionUpdatePubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageConversionStartedSysMsgHdlr.scala 66 additions, 0 deletions

...tionpod/PresentationPageConversionStartedSysMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageConvertedSysMsgHdlr.scala 78 additions, 0 deletions

...presentationpod/PresentationPageConvertedSysMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPodHdlrs.scala 4 additions, 1 deletion

...tton/core/apps/presentationpod/PresentationPodHdlrs.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPodsApp.scala 37 additions, 4 deletions

...utton/core/apps/presentationpod/PresentationPodsApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/ResizeAndMovePagePubMsgHdlr.scala 2 additions, 2 deletions

...re/apps/presentationpod/ResizeAndMovePagePubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala 5 additions, 5 deletions

.../src/main/scala/org/bigbluebutton/core/models/Polls.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/PresentationPods.scala 28 additions, 5 deletions

...cala/org/bigbluebutton/core/models/PresentationPods.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 8 additions, 0 deletions

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

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala 15 additions, 1 deletion

...c/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
akka-bbb-fsesl/project/Dependencies.scala 2 additions, 3 deletions

akka-bbb-fsesl/project/Dependencies.scala
bbb-common-message/project/Dependencies.scala 1 addition, 1 deletion

bbb-common-message/project/Dependencies.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Presentation.scala 18 additions, 0 deletions

...scala/org/bigbluebutton/common2/domain/Presentation.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PresentationPodsMsgs.scala 116 additions, 3 deletions

...org/bigbluebutton/common2/msgs/PresentationPodsMsgs.scala

with 457 additions and 54 deletions

Please register or to comment