-
- Downloads
Merge branch 'merge-presentation-deskshare' into mconf
Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
Showing
- bigbluebutton-client/branding/default/style/css/BBBDefault.css 12 additions, 0 deletions...uebutton-client/branding/default/style/css/BBBDefault.css
- bigbluebutton-client/locale/en_US/bbbResources.properties 4 additions, 2 deletionsbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/locale/pt_BR/bbbResources.properties 4 additions, 2 deletionsbigbluebutton-client/locale/pt_BR/bbbResources.properties
- bigbluebutton-client/src/org/bigbluebutton/main/events/PresenterStatusEvent.as 2 additions, 0 deletions...src/org/bigbluebutton/main/events/PresenterStatusEvent.as
- bigbluebutton-client/src/org/bigbluebutton/main/views/VideoWithWarningsBase.mxml 1 addition, 0 deletions...c/org/bigbluebutton/main/views/VideoWithWarningsBase.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/events/ShareEvent.as 15 additions, 0 deletions.../org/bigbluebutton/modules/deskshare/events/ShareEvent.as
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as 36 additions, 15 deletions...bluebutton/modules/deskshare/managers/DeskshareManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as 34 additions, 24 deletions...button/modules/deskshare/managers/PublishWindowManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as 21 additions, 12 deletions...ebutton/modules/deskshare/managers/ViewerWindowManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/maps/DeskshareEventMap.mxml 28 additions, 3 deletions...gbluebutton/modules/deskshare/maps/DeskshareEventMap.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml 55 additions, 247 deletions...dules/deskshare/view/components/DesktopPublishWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml 166 additions, 119 deletions.../modules/deskshare/view/components/DesktopViewWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/VideoWithWarnings.as 46 additions, 0 deletions...on/modules/deskshare/view/components/VideoWithWarnings.as
- bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml 327 additions, 27 deletions...uebutton/modules/present/ui/views/PresentationWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml 8 additions, 1 deletion...org/bigbluebutton/modules/present/ui/views/SlideView.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml 29 additions, 21 deletions...bluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml 13 additions, 5 deletions...luebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
- record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js 50 additions, 0 deletions...k/presentation/playback/presentation/0.9.0/lib/writing.js
- record-and-playback/presentation/scripts/publish/presentation.rb 34 additions, 0 deletions...and-playback/presentation/scripts/publish/presentation.rb
Loading
Please register or sign in to comment