Commit 154d3d60 authored 7 years ago by Richard Alam

Merge branch 'antobinary-pods_vol4'

parents 40fbc781 11f0bdf0

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/apps/PresentationModel.scala 3 additions, 0 deletions

...scala/org/bigbluebutton/core/apps/PresentationModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp2x.scala 0 additions, 1 deletion

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

...ton/core/apps/presentation/SetCurrentPagePubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionCompletedSysPubMsgHdlr.scala 2 additions, 2 deletions

...ionpod/PresentationConversionCompletedSysPubMsgHdlr.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/presentationpod/PresentationPodsApp.scala 6 additions, 3 deletions

...utton/core/apps/presentationpod/PresentationPodsApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetCurrentPagePubMsgHdlr.scala 62 additions, 0 deletions

.../core/apps/presentationpod/SetCurrentPagePubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/PresentationPods.scala 50 additions, 6 deletions

...cala/org/bigbluebutton/core/models/PresentationPods.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 1 addition, 4 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PresentationMsgs.scala 0 additions, 8 deletions

...ala/org/bigbluebutton/common2/msgs/PresentationMsgs.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PresentationPodsMsgs.scala 10 additions, 0 deletions

...org/bigbluebutton/common2/msgs/PresentationPodsMsgs.scala
bigbluebutton-client/src/org/bigbluebutton/modules/present/business/PresentProxy.as 24 additions, 21 deletions

...rg/bigbluebutton/modules/present/business/PresentProxy.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/commands/GoToNextPageCommand.as 6 additions, 4 deletions

...luebutton/modules/present/commands/GoToNextPageCommand.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/commands/GoToPageCommand.as 4 additions, 2 deletions

...bigbluebutton/modules/present/commands/GoToPageCommand.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/commands/GoToPageLocalCommand.as 16 additions, 0 deletions

...uebutton/modules/present/commands/GoToPageLocalCommand.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/commands/GoToPrevPageCommand.as 6 additions, 4 deletions

...luebutton/modules/present/commands/GoToPrevPageCommand.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/services/messaging/MessageSender.as 2 additions, 2 deletions

...utton/modules/present/services/messaging/MessageSender.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml 13 additions, 3 deletions

...uebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml 3 additions, 2 deletions

...org/bigbluebutton/modules/present/ui/views/SlideView.mxml

with 209 additions and 95 deletions

Please register or to comment