Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into...
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020
Showing
- bbb-common-web/src/main/java/org/bigbluebutton/presentation/DocumentConversionServiceImp.java 6 additions, 0 deletions...bluebutton/presentation/DocumentConversionServiceImp.java
- bbb-common-web/src/main/java/org/bigbluebutton/presentation/OfficeToPdfConversionSuccessFilter.java 8 additions, 21 deletions...tton/presentation/OfficeToPdfConversionSuccessFilter.java
- bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeToPdfConversionService.java 2 additions, 0 deletions...button/presentation/imp/OfficeToPdfConversionService.java
- bigbluebutton-config/bin/bbb-conf 1 addition, 1 deletionbigbluebutton-config/bin/bbb-conf
- bigbluebutton-config/web/css/style.css 1 addition, 1 deletionbigbluebutton-config/web/css/style.css
- bigbluebutton-config/web/images/bbb-logo.png 0 additions, 0 deletionsbigbluebutton-config/web/images/bbb-logo.png
- bigbluebutton-config/web/images/blankoverview.png 0 additions, 0 deletionsbigbluebutton-config/web/images/blankoverview.png
- bigbluebutton-config/web/index.html 31 additions, 30 deletionsbigbluebutton-config/web/index.html
- bigbluebutton-html5/.meteor/packages 0 additions, 2 deletionsbigbluebutton-html5/.meteor/packages
- bigbluebutton-html5/.meteor/versions 0 additions, 2 deletionsbigbluebutton-html5/.meteor/versions
- bigbluebutton-html5/imports/api/annotations/server/methods/clearWhiteboard.js 3 additions, 14 deletions...imports/api/annotations/server/methods/clearWhiteboard.js
- bigbluebutton-html5/imports/api/annotations/server/methods/sendAnnotation.js 5 additions, 102 deletions.../imports/api/annotations/server/methods/sendAnnotation.js
- bigbluebutton-html5/imports/api/annotations/server/methods/sendAnnotationHelper.js 65 additions, 0 deletions...ts/api/annotations/server/methods/sendAnnotationHelper.js
- bigbluebutton-html5/imports/api/annotations/server/methods/sendBulkAnnotations.js 5 additions, 6 deletions...rts/api/annotations/server/methods/sendBulkAnnotations.js
- bigbluebutton-html5/imports/api/annotations/server/methods/undoAnnotation.js 3 additions, 15 deletions.../imports/api/annotations/server/methods/undoAnnotation.js
- bigbluebutton-html5/imports/api/annotations/server/publishers.js 7 additions, 7 deletions...button-html5/imports/api/annotations/server/publishers.js
- bigbluebutton-html5/imports/api/audio/client/bridge/sip.js 39 additions, 30 deletionsbigbluebutton-html5/imports/api/audio/client/bridge/sip.js
- bigbluebutton-html5/imports/api/breakouts/server/methods/createBreakout.js 3 additions, 11 deletions...l5/imports/api/breakouts/server/methods/createBreakout.js
- bigbluebutton-html5/imports/api/breakouts/server/methods/endAllBreakouts.js 3 additions, 7 deletions...5/imports/api/breakouts/server/methods/endAllBreakouts.js
- bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js 3 additions, 6 deletions...l5/imports/api/breakouts/server/methods/requestJoinURL.js
Loading
Please register or sign in to comment