-
- Downloads
Merge remote branch 'mconf/camera-usability-improvement'
Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
Showing
- bigbluebutton-client/locale/en_US/bbbResources.properties 7 additions, 4 deletionsbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/src/org/bigbluebutton/common/Images.as 7 additions, 1 deletionbigbluebutton-client/src/org/bigbluebutton/common/Images.as
- bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_on.png 0 additions, 0 deletions...c/org/bigbluebutton/common/assets/images/deskshare_on.png
- bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_on.png 0 additions, 0 deletions.../src/org/bigbluebutton/common/assets/images/webcam_on.png
- bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as 3 additions, 3 deletions.../src/org/bigbluebutton/main/model/users/UsersSOService.as
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/events/StopSharingButtonEvent.as 33 additions, 0 deletions...button/modules/deskshare/events/StopSharingButtonEvent.as
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as 5 additions, 3 deletions...bluebutton/modules/deskshare/managers/DeskshareManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ToolbarButtonManager.as 11 additions, 3 deletions...button/modules/deskshare/managers/ToolbarButtonManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml 15 additions, 0 deletions...dules/deskshare/view/components/DesktopPublishWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml 73 additions, 5 deletions...tton/modules/deskshare/view/components/ToolbarButton.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/assets/Images.as 10 additions, 7 deletions...rc/org/bigbluebutton/modules/phone/views/assets/Images.as
- bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/assets/images/headset_open.png 0 additions, 0 deletions...button/modules/phone/views/assets/images/headset_open.png
- bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml 51 additions, 17 deletions...ebutton/modules/phone/views/components/ToolbarButton.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/events/ClosePublishWindowEvent.as 33 additions, 0 deletions...utton/modules/videoconf/events/ClosePublishWindowEvent.as
- bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml 17 additions, 1 deletion...g/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml 74 additions, 11 deletions.../bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
Loading
Please register or sign in to comment