-
- Downloads
Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x
# Conflicts: # bigbluebutton-client/resources/config.xml.template # bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as # bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml # record-and-playback/core/scripts/rap-process-worker.rb
Showing
- bbb-api-demo/src/main/webapp/demoHTML5.jsp 11 additions, 2 deletionsbbb-api-demo/src/main/webapp/demoHTML5.jsp
- bigbluebutton-client/build.xml 1 addition, 1 deletionbigbluebutton-client/build.xml
- bigbluebutton-client/resources/config.xml.template 0 additions, 3 deletionsbigbluebutton-client/resources/config.xml.template
- bigbluebutton-client/resources/prod/BigBlueButton.html 3 additions, 3 deletionsbigbluebutton-client/resources/prod/BigBlueButton.html
- bigbluebutton-client/resources/prod/lib/verto-min.js 1 addition, 1 deletionbigbluebutton-client/resources/prod/lib/verto-min.js
- bigbluebutton-client/resources/prod/locales.xml 2 additions, 2 deletionsbigbluebutton-client/resources/prod/locales.xml
- bigbluebutton-client/src/BigBlueButton.mxml 6 additions, 1 deletionbigbluebutton-client/src/BigBlueButton.mxml
- bigbluebutton-client/src/VideoconfModule.mxml 0 additions, 5 deletionsbigbluebutton-client/src/VideoconfModule.mxml
- bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml 4 additions, 22 deletions...rc/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as 12 additions, 21 deletions...lient/src/org/bigbluebutton/modules/phone/PhoneOptions.as
- bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as 1 addition, 15 deletions.../bigbluebutton/modules/phone/managers/FlashCallManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as 0 additions, 14 deletions...bigbluebutton/modules/phone/managers/WebRTCCallManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml 0 additions, 5 deletions...g/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/WebRTCEventMap.mxml 1 addition, 5 deletions.../org/bigbluebutton/modules/phone/maps/WebRTCEventMap.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml 28 additions, 16 deletions...ebutton/modules/phone/views/components/ToolbarButton.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as 0 additions, 12 deletions...luebutton/modules/videoconf/maps/VideoEventMapDelegate.as
- bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/model/VideoConfOptions.as 51 additions, 59 deletions...bigbluebutton/modules/videoconf/model/VideoConfOptions.as
- bigbluebutton-config/bigbluebutton-release 1 addition, 1 deletionbigbluebutton-config/bigbluebutton-release
- bigbluebutton-config/web/index.html 1 addition, 1 deletionbigbluebutton-config/web/index.html
- bigbluebutton-html5/imports/api/shapes/server/modifiers/addShape.js 1 addition, 1 deletion...ton-html5/imports/api/shapes/server/modifiers/addShape.js
Loading
Please register or sign in to comment