Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into...
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into captions-text-tracks-intermediate-branch
Showing
- bigbluebutton-config/bin/bbb-conf 17 additions, 9 deletionsbigbluebutton-config/bin/bbb-conf
- bigbluebutton-html5/imports/api/annotations/server/methods/sendAnnotation.js 48 additions, 3 deletions.../imports/api/annotations/server/methods/sendAnnotation.js
- bigbluebutton-html5/imports/api/audio/client/bridge/kurento.js 4 additions, 1 deletion...uebutton-html5/imports/api/audio/client/bridge/kurento.js
- bigbluebutton-html5/imports/api/audio/client/bridge/sip.js 5 additions, 2 deletionsbigbluebutton-html5/imports/api/audio/client/bridge/sip.js
- bigbluebutton-html5/imports/startup/client/base.jsx 2 additions, 2 deletionsbigbluebutton-html5/imports/startup/client/base.jsx
- bigbluebutton-html5/imports/startup/client/intl.jsx 2 additions, 0 deletionsbigbluebutton-html5/imports/startup/client/intl.jsx
- bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx 1 addition, 1 deletion...ml5/imports/ui/components/audio/audio-modal/component.jsx
- bigbluebutton-html5/imports/ui/components/audio/permissions-overlay/component.jsx 2 additions, 0 deletions...rts/ui/components/audio/permissions-overlay/component.jsx
- bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx 1 addition, 0 deletions...orts/ui/components/end-meeting-confirmation/component.jsx
- bigbluebutton-html5/imports/ui/components/lock-viewers/notify/component.jsx 51 additions, 6 deletions...5/imports/ui/components/lock-viewers/notify/component.jsx
- bigbluebutton-html5/imports/ui/components/media/component.jsx 19 additions, 5 deletions...luebutton-html5/imports/ui/components/media/component.jsx
- bigbluebutton-html5/imports/ui/components/media/styles.scss 81 additions, 27 deletionsbigbluebutton-html5/imports/ui/components/media/styles.scss
- bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/component.jsx 551 additions, 0 deletions...i/components/media/webcam-draggable-overlay/component.jsx
- bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx 1 addition, 1 deletion...n-html5/imports/ui/components/meeting-ended/component.jsx
- bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx 30 additions, 6 deletions...tml5/imports/ui/components/modal/fullscreen/component.jsx
- bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx 33 additions, 4 deletions...mponents/presentation/presentation-uploader/component.jsx
- bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx 6 additions, 0 deletions...st-content/user-participants/user-list-item/component.jsx
- bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/container.jsx 14 additions, 3 deletions...st-content/user-participants/user-list-item/container.jsx
- bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx 9 additions, 2 deletions...r-participants/user-list-item/user-dropdown/component.jsx
- bigbluebutton-html5/imports/ui/components/video-preview/component.jsx 1 addition, 1 deletion...n-html5/imports/ui/components/video-preview/component.jsx
Loading
Please register or sign in to comment