Commit 0190ef45 authored 6 years ago by Anton Georgiev

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logout-endmeeting-menu

parents 797a485d 3e9ec142

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-config/bin/bbb-conf 23 additions, 1 deletion

bigbluebutton-config/bin/bbb-conf
bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js 7 additions, 4 deletions

...l5/imports/api/breakouts/server/methods/requestJoinURL.js
bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx 75 additions, 8 deletions

.../ui/components/actions-bar/actions-dropdown/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx 8 additions, 0 deletions

...ton-html5/imports/ui/components/actions-bar/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx 6 additions, 0 deletions

...ton-html5/imports/ui/components/actions-bar/container.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx 85 additions, 16 deletions

...components/actions-bar/create-breakout-room/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/service.js 18 additions, 0 deletions

...button-html5/imports/ui/components/actions-bar/service.js
bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx 1 addition, 0 deletions

...imports/ui/components/authenticated-handler/component.jsx
bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx 4 additions, 3 deletions

...ponents/chat/message-list/message-list-item/component.jsx
bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx 7 additions, 7 deletions

...chat/message-list/message-list-item/message/component.jsx
bigbluebutton-html5/imports/ui/components/error-screen/component.jsx 14 additions, 1 deletion

...on-html5/imports/ui/components/error-screen/component.jsx
bigbluebutton-html5/imports/ui/components/error-screen/styles.scss 30 additions, 2 deletions

...tton-html5/imports/ui/components/error-screen/styles.scss
bigbluebutton-html5/imports/ui/components/join-handler/component.jsx 9 additions, 7 deletions

...on-html5/imports/ui/components/join-handler/component.jsx
bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx 13 additions, 2 deletions

...on-html5/imports/ui/components/modal/simple/component.jsx
bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx 54 additions, 51 deletions

...tml5/imports/ui/components/poll/live-result/component.jsx
bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx 9 additions, 2 deletions

...omponents/presentation/presentation-overlay/component.jsx
bigbluebutton-html5/imports/ui/components/user-list/component.jsx 27 additions, 25 deletions

...utton-html5/imports/ui/components/user-list/component.jsx
bigbluebutton-html5/imports/ui/components/user-list/container.jsx 1 addition, 0 deletions

...utton-html5/imports/ui/components/user-list/container.jsx
bigbluebutton-html5/imports/ui/components/user-list/service.js 5 additions, 3 deletions

...uebutton-html5/imports/ui/components/user-list/service.js
bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx 2 additions, 0 deletions

...s/ui/components/user-list/user-list-content/component.jsx

with 398 additions and 132 deletions

Please register or to comment