Commit 2048511c authored 4 years ago by Richard Alam

Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into sync-breakouts-time-remaining

parents ba40af83 3455b205

Expand all Hide whitespace changes

Inline Side-by-side

Showing

bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java 64 additions, 37 deletions

...rg/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
bigbluebutton-html5/imports/api/audio/client/bridge/sip.js 39 additions, 14 deletions

bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
bigbluebutton-html5/imports/ui/components/chat/time-window-list/component.jsx 5 additions, 0 deletions

...imports/ui/components/chat/time-window-list/component.jsx
bigbluebutton-html5/imports/ui/components/components-data/chat-context/adapter.jsx 17 additions, 5 deletions

...ts/ui/components/components-data/chat-context/adapter.jsx
bigbluebutton-html5/imports/ui/components/components-data/chat-context/context.jsx 5 additions, 2 deletions

...ts/ui/components/components-data/chat-context/context.jsx
bigbluebutton-html5/imports/ui/components/connection-status/button/component.jsx 64 additions, 55 deletions

...orts/ui/components/connection-status/button/component.jsx
bigbluebutton-html5/imports/ui/components/connection-status/button/styles.scss 6 additions, 15 deletions

...mports/ui/components/connection-status/button/styles.scss
bigbluebutton-html5/imports/ui/components/connection-status/icon/component.jsx 39 additions, 0 deletions

...mports/ui/components/connection-status/icon/component.jsx
bigbluebutton-html5/imports/ui/components/connection-status/icon/styles.scss 40 additions, 0 deletions

.../imports/ui/components/connection-status/icon/styles.scss
bigbluebutton-html5/imports/ui/components/connection-status/modal/component.jsx 4 additions, 2 deletions

...ports/ui/components/connection-status/modal/component.jsx
bigbluebutton-html5/imports/ui/components/connection-status/modal/styles.scss 5 additions, 0 deletions

...imports/ui/components/connection-status/modal/styles.scss
bigbluebutton-html5/imports/ui/components/connection-status/service.js 1 addition, 1 deletion

...-html5/imports/ui/components/connection-status/service.js
bigbluebutton-html5/imports/ui/components/poll/component.jsx 2 additions, 2 deletions

bigbluebutton-html5/imports/ui/components/poll/component.jsx
bigbluebutton-html5/imports/ui/components/poll/styles.scss 10 additions, 2 deletions

bigbluebutton-html5/imports/ui/components/poll/styles.scss
bigbluebutton-html5/imports/ui/components/whiteboard/annotations/poll/component.jsx 7 additions, 4 deletions

...s/ui/components/whiteboard/annotations/poll/component.jsx
bigbluebutton-html5/public/locales/ar.json 19 additions, 14 deletions

bigbluebutton-html5/public/locales/ar.json
bigbluebutton-html5/public/locales/az.json 0 additions, 1 deletion

bigbluebutton-html5/public/locales/az.json
bigbluebutton-html5/public/locales/ca.json 0 additions, 1 deletion

bigbluebutton-html5/public/locales/ca.json
bigbluebutton-html5/public/locales/cs_CZ.json 175 additions, 31 deletions

bigbluebutton-html5/public/locales/cs_CZ.json
bigbluebutton-html5/public/locales/da.json 0 additions, 1 deletion

bigbluebutton-html5/public/locales/da.json

with 502 additions and 187 deletions

Please register or to comment