Commit 5be5aed1 authored 4 years ago by Anton Georgiev

Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12

parents 9bdaf396 9d438a52

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java 9 additions, 9 deletions

.../main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ThumbnailCreatorImp.java 13 additions, 2 deletions

...g/bigbluebutton/presentation/imp/ThumbnailCreatorImp.java
bigbluebutton-config/bigbluebutton-release 1 addition, 0 deletions

bigbluebutton-config/bigbluebutton-release
bigbluebutton-config/bin/bbb-conf 3 additions, 2 deletions

bigbluebutton-config/bin/bbb-conf
bigbluebutton-html5/imports/api/audio/client/bridge/kurento.js 1 addition, 1 deletion

...uebutton-html5/imports/api/audio/client/bridge/kurento.js
bigbluebutton-html5/imports/api/group-chat-msg/server/modifiers/clearGroupChatMsg.js 1 addition, 1 deletion

.../api/group-chat-msg/server/modifiers/clearGroupChatMsg.js
bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js 24 additions, 4 deletions

...html5/imports/api/meetings/server/modifiers/addMeeting.js
bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js 1 addition, 1 deletion

...orts/api/users-settings/server/methods/addUserSettings.js
bigbluebutton-html5/imports/api/users-settings/server/publishers.js 29 additions, 0 deletions

...ton-html5/imports/api/users-settings/server/publishers.js
bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js 13 additions, 1 deletion

...utton-html5/imports/api/users/server/modifiers/addUser.js
bigbluebutton-html5/imports/startup/client/intl.jsx 4 additions, 0 deletions

bigbluebutton-html5/imports/startup/client/intl.jsx
bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx 14 additions, 3 deletions

...ts/ui/components/breakout-join-confirmation/component.jsx
bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx 3 additions, 1 deletion

...imports/ui/components/external-video-player/component.jsx
bigbluebutton-html5/imports/ui/components/external-video-player/custom-players/panopto.jsx 16 additions, 0 deletions

...mponents/external-video-player/custom-players/panopto.jsx
bigbluebutton-html5/imports/ui/components/external-video-player/service.js 11 additions, 2 deletions

...l5/imports/ui/components/external-video-player/service.js
bigbluebutton-html5/imports/ui/components/fullscreen-button/styles.scss 1 addition, 8 deletions

...html5/imports/ui/components/fullscreen-button/styles.scss
bigbluebutton-html5/imports/ui/components/join-handler/component.jsx 10 additions, 1 deletion

...on-html5/imports/ui/components/join-handler/component.jsx
bigbluebutton-html5/imports/ui/components/media/styles.scss 47 additions, 1 deletion

bigbluebutton-html5/imports/ui/components/media/styles.scss
bigbluebutton-html5/imports/ui/components/presentation/component.jsx 4 additions, 4 deletions

...on-html5/imports/ui/components/presentation/component.jsx
bigbluebutton-html5/imports/ui/components/presentation/download-presentation-button/styles.scss 1 addition, 7 deletions

...nts/presentation/download-presentation-button/styles.scss

with 206 additions and 48 deletions

Please register or to comment