Commit e71ac6bf authored 7 years ago by Richard Alam

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into screenshare-chapter-breaks

parents 4e9185b6 548b63ec

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetPresenterInPodReqMsgHdlr.scala 4 additions, 3 deletions

...re/apps/presentationpod/SetPresenterInPodReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/SendCursorPositionPubMsgHdlr.scala 1 addition, 1 deletion

...n/core/apps/whiteboard/SendCursorPositionPubMsgHdlr.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PresentationPodsMsgs.scala 2 additions, 2 deletions

...org/bigbluebutton/common2/msgs/PresentationPodsMsgs.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WhiteboardMsgs.scala 4 additions, 12 deletions

...scala/org/bigbluebutton/common2/msgs/WhiteboardMsgs.scala
bigbluebutton-client/src/org/bigbluebutton/modules/present/business/PresentProxy.as 3 additions, 4 deletions

...rg/bigbluebutton/modules/present/business/PresentProxy.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/events/SetPresenterInPodReqEvent.as 4 additions, 2 deletions

...utton/modules/present/events/SetPresenterInPodReqEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/events/SetPresenterInPodRespEvent.as 3 additions, 1 deletion

...tton/modules/present/events/SetPresenterInPodRespEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/model/PresentationPodManager.as 0 additions, 13 deletions

...luebutton/modules/present/model/PresentationPodManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/services/messaging/MessageReceiver.as 2 additions, 1 deletion

...ton/modules/present/services/messaging/MessageReceiver.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 45 additions, 49 deletions

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

...org/bigbluebutton/modules/present/ui/views/SlideView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as 1 addition, 6 deletions

...bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/events/WhiteboardCursorEvent.as 1 addition, 0 deletions

...button/modules/whiteboard/events/WhiteboardCursorEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as 2 additions, 1 deletion

...igbluebutton/modules/whiteboard/models/WhiteboardModel.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/services/MessageReceiver.as 4 additions, 3 deletions

...bluebutton/modules/whiteboard/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/services/MessageSender.as 2 additions, 2 deletions

...igbluebutton/modules/whiteboard/services/MessageSender.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/services/WhiteboardService.as 1 addition, 1 deletion

...uebutton/modules/whiteboard/services/WhiteboardService.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/CursorPositionListener.as 4 additions, 5 deletions

...button/modules/whiteboard/views/CursorPositionListener.as

with 125 additions and 152 deletions

Please register or to comment