Merge pull request #5800 from antobinary/current
Pull BBB 2.0 into BBB 2.2
No related branches found
No related tags found
Showing
- bbb-client-check/src/org/bigbluebutton/clientcheck/service/RTMPTunnelingService.as 2 additions, 1 deletion...bigbluebutton/clientcheck/service/RTMPTunnelingService.as
- bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Application.java 1 addition, 1 deletion...in/java/org/bigbluebutton/voiceconf/red5/Application.java
- bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/assets/sounds/ScreenshareOff.mp3 0 additions, 0 deletions...tton/modules/screenshare/assets/sounds/ScreenshareOff.mp3
- bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ViewerWindowManager.as 1 addition, 0 deletions...utton/modules/screenshare/managers/ViewerWindowManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCPublishWindowManager.as 4 additions, 6 deletions...odules/screenshare/managers/WebRTCPublishWindowManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCViewerWindowManager.as 4 additions, 2 deletions...modules/screenshare/managers/WebRTCViewerWindowManager.as
- bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml 11 additions, 0 deletions...screenshare/view/components/ScreensharePublishWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopPublishWindow.mxml 28 additions, 22 deletions...reenshare/view/components/WebRTCDesktopPublishWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as 3 additions, 0 deletions...g/bigbluebutton/modules/users/services/MessageReceiver.as
- bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml 3 additions, 2 deletions.../bigbluebutton/modules/users/views/MediaItemRenderer.mxml
- bigbluebutton-config/bin/bbb-conf 6 additions, 5 deletionsbigbluebutton-config/bin/bbb-conf
- bigbluebutton-html5/client/main.html 1 addition, 1 deletionbigbluebutton-html5/client/main.html
- bigbluebutton-html5/imports/api/audio/client/bridge/base.js 2 additions, 0 deletionsbigbluebutton-html5/imports/api/audio/client/bridge/base.js
- bigbluebutton-html5/imports/api/audio/client/bridge/sip.js 28 additions, 7 deletionsbigbluebutton-html5/imports/api/audio/client/bridge/sip.js
- bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js 0 additions, 25 deletions...l5/imports/api/users/server/handlers/validateAuthToken.js
- bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js 35 additions, 0 deletions...utton-html5/imports/api/users/server/modifiers/addUser.js
- bigbluebutton-html5/imports/startup/client/base.jsx 4 additions, 3 deletionsbigbluebutton-html5/imports/startup/client/base.jsx
- bigbluebutton-html5/imports/ui/components/audio/container.jsx 18 additions, 0 deletions...luebutton-html5/imports/ui/components/audio/container.jsx
- bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx 12 additions, 6 deletions...ml5/imports/ui/components/chat/message-form/component.jsx
- bigbluebutton-html5/imports/ui/components/chat/message-form/styles.scss 1 addition, 1 deletion...html5/imports/ui/components/chat/message-form/styles.scss
Loading
Please register or sign in to comment