Commit 052d21b8 authored 7 years ago by Richard Alam

Merge branch 'capilkey-2.1-whiteboard-improvements'

parents 50e84db9 e0d09710

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/WhiteboardModel.scala 10 additions, 14 deletions

...n/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/ClearWhiteboardPubMsgHdlr.scala 1 addition, 1 deletion

...tton/core/apps/whiteboard/ClearWhiteboardPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/GetWhiteboardAccessReqMsgHdlr.scala 0 additions, 25 deletions

.../core/apps/whiteboard/GetWhiteboardAccessReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/GetWhiteboardAnnotationsReqMsgHdlr.scala 7 additions, 4 deletions

.../apps/whiteboard/GetWhiteboardAnnotationsReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/ModifyWhiteboardAccessPubMsgHdlr.scala 3 additions, 3 deletions

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

...n/core/apps/whiteboard/SendCursorPositionPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala 1 addition, 1 deletion

.../apps/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/SyncWhiteboardAccessRespMsgHdlr.scala 0 additions, 25 deletions

...ore/apps/whiteboard/SyncWhiteboardAccessRespMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/UndoWhiteboardPubMsgHdlr.scala 1 addition, 1 deletion

...utton/core/apps/whiteboard/UndoWhiteboardPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp2x.scala 9 additions, 7 deletions

.../bigbluebutton/core/apps/whiteboard/WhiteboardApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 0 additions, 2 deletions

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

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

.../org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WhiteboardMsgs.scala 46 additions, 101 deletions

...scala/org/bigbluebutton/common2/msgs/WhiteboardMsgs.scala
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasDisplayModel.as 11 additions, 7 deletions

...button/modules/whiteboard/WhiteboardCanvasDisplayModel.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/commands/GetWhiteboardAccessCommand.as 0 additions, 14 deletions

...modules/whiteboard/commands/GetWhiteboardAccessCommand.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as 1 addition, 4 deletions

...uebutton/modules/whiteboard/managers/WhiteboardManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardEventMap.mxml 0 additions, 7 deletions

...luebutton/modules/whiteboard/maps/WhiteboardEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/Whiteboard.as 9 additions, 0 deletions

...org/bigbluebutton/modules/whiteboard/models/Whiteboard.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as 13 additions, 13 deletions

...igbluebutton/modules/whiteboard/models/WhiteboardModel.as

with 113 additions and 235 deletions

Please register or to comment