Commit 49ce5f58 authored 6 years ago by Richard Alam

Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-client-logging

parents d0fe1752 1ecc0702

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-client/branding/default/style/css/V2Theme.css 6 additions, 1 deletion

bigbluebutton-client/branding/default/style/css/V2Theme.css
bigbluebutton-client/locale/en_US/bbbResources.properties 9 additions, 2 deletions

bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/resources/config.xml.template 2 additions, 3 deletions

bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/lib/kurento-extension.js 81 additions, 88 deletions

bigbluebutton-client/resources/prod/lib/kurento-extension.js
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml 9 additions, 2 deletions

...rc/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/events/RequestToStartSharing.as 5 additions, 1 deletion

...utton/modules/screenshare/events/RequestToStartSharing.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/events/ScreenshareSelectionWindowEvent.as 12 additions, 0 deletions

...les/screenshare/events/ScreenshareSelectionWindowEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/events/UseJavaModeCommand.as 0 additions, 14 deletions

...uebutton/modules/screenshare/events/UseJavaModeCommand.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/events/WebRTCPublishWindowChangeState.as 0 additions, 3 deletions

...ules/screenshare/events/WebRTCPublishWindowChangeState.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as 14 additions, 17 deletions

...button/modules/screenshare/managers/ScreenshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ToolbarButtonManager.as 0 additions, 9 deletions

...tton/modules/screenshare/managers/ToolbarButtonManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as 14 additions, 96 deletions

...on/modules/screenshare/managers/WebRTCDeskshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCPublishWindowManager.as 5 additions, 6 deletions

...odules/screenshare/managers/WebRTCPublishWindowManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCViewerWindowManager.as 3 additions, 1 deletion

...modules/screenshare/managers/WebRTCViewerWindowManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml 1 addition, 6 deletions

...ebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml 1 addition, 15 deletions

...ton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as 1 addition, 4 deletions

...luebutton/modules/screenshare/model/ScreenshareOptions.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/WebRTCDeskshareService.as 3 additions, 2 deletions

...on/modules/screenshare/services/WebRTCDeskshareService.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as 11 additions, 11 deletions

...ton/modules/screenshare/utils/WebRTCScreenshareUtility.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/AnimatedDots.as 40 additions, 0 deletions

...utton/modules/screenshare/view/components/AnimatedDots.as

with 217 additions and 281 deletions

Please register or to comment