Commit b6176ac7 authored 7 years ago by Richard Alam Committed by GitHub 7 years ago

Merge pull request #3957 from capilkey/multi-user-2.0-take5

Whiteboard updates for 2.0

parents 4dda35a3 206822f1

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java 1 addition, 1 deletion

...src/main/java/org/bigbluebutton/common/messages/Util.java
bigbluebutton-client/src/org/bigbluebutton/common/IBbbCanvas.as 0 additions, 39 deletions

...ebutton-client/src/org/bigbluebutton/common/IBbbCanvas.as
bigbluebutton-client/src/org/bigbluebutton/main/events/PresenterStatusEvent.as 0 additions, 2 deletions

...src/org/bigbluebutton/main/events/PresenterStatusEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/api/PresentationAPI.as 0 additions, 64 deletions

.../org/bigbluebutton/modules/present/api/PresentationAPI.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/events/AddOverlayCanvasEvent.as 0 additions, 37 deletions

...luebutton/modules/present/events/AddOverlayCanvasEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/maps/PresentEventMap.mxml 1 addition, 21 deletions

...g/bigbluebutton/modules/present/maps/PresentEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml 85 additions, 66 deletions

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

...org/bigbluebutton/modules/present/ui/views/SlideView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml 28 additions, 82 deletions

...es/screenshare/view/components/ScreenshareViewWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasDisplayModel.as 19 additions, 64 deletions

...button/modules/whiteboard/WhiteboardCanvasDisplayModel.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as 10 additions, 20 deletions

...bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawAnnotation.as 1 addition, 2 deletions

...tton/modules/whiteboard/business/shapes/DrawAnnotation.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as 4 additions, 7 deletions

...uebutton/modules/whiteboard/business/shapes/DrawObject.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as 2 additions, 22 deletions

...gbluebutton/modules/whiteboard/business/shapes/Ellipse.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/EllipseAnnotation.as 3 additions, 10 deletions

...n/modules/whiteboard/business/shapes/EllipseAnnotation.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/GraphicObject.as 2 additions, 2 deletions

...utton/modules/whiteboard/business/shapes/GraphicObject.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/IDrawAnnotation.as 1 addition, 1 deletion

...ton/modules/whiteboard/business/shapes/IDrawAnnotation.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Line.as 4 additions, 1 deletion

.../bigbluebutton/modules/whiteboard/business/shapes/Line.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/LineAnnotation.as 3 additions, 4 deletions

...tton/modules/whiteboard/business/shapes/LineAnnotation.as
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as 4 additions, 4 deletions

...igbluebutton/modules/whiteboard/business/shapes/Pencil.as

with 183 additions and 500 deletions

Please register or to comment