Commit 89399021 authored 7 years ago by Richard Alam

Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat

parents fa6a1be5 af3273b4

Hide whitespace changes

Inline Side-by-side

Showing

bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 15 additions, 1 deletion

...b/src/main/java/org/bigbluebutton/api/MeetingService.java
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/UserJoinedVoice.java 3 additions, 1 deletion

...bigbluebutton/api/messaging/messages/UserJoinedVoice.java
bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala 4 additions, 4 deletions

.../main/scala/org/bigbluebutton/api2/domain/Recording.scala
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala 1 addition, 1 deletion

...g/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml 6 additions, 4 deletions

...n-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as 2 additions, 3 deletions

...rg/bigbluebutton/modules/layout/model/LayoutDefinition.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml 23 additions, 14 deletions

...es/screenshare/view/components/ScreenshareViewWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopViewWindow.mxml 1 addition, 1 deletion

.../screenshare/view/components/WebRTCDesktopViewWindow.mxml
bigbluebutton-html5/client/main.jsx 9 additions, 1 deletion

bigbluebutton-html5/client/main.jsx
bigbluebutton-html5/client/stylesheets/toastify.css 120 additions, 0 deletions

bigbluebutton-html5/client/stylesheets/toastify.css
bigbluebutton-html5/imports/api/chat/server/methods/sendChat.js 2 additions, 1 deletion

...ebutton-html5/imports/api/chat/server/methods/sendChat.js
bigbluebutton-html5/imports/api/common/server/helpers.js 1 addition, 3 deletions

bigbluebutton-html5/imports/api/common/server/helpers.js
bigbluebutton-html5/imports/api/cursor/server/modifiers/updateCursor.js 4 additions, 3 deletions

...html5/imports/api/cursor/server/modifiers/updateCursor.js
bigbluebutton-html5/imports/api/log-client/server/methods.js 1 addition, 1 deletion

bigbluebutton-html5/imports/api/log-client/server/methods.js
bigbluebutton-html5/imports/api/log-client/server/methods/logClient.js 2 additions, 4 deletions

...-html5/imports/api/log-client/server/methods/logClient.js
bigbluebutton-html5/imports/api/meetings/server/eventHandlers.js 2 additions, 0 deletions

...button-html5/imports/api/meetings/server/eventHandlers.js
bigbluebutton-html5/imports/api/meetings/server/handlers/recordingStatusChange.js 29 additions, 0 deletions

...rts/api/meetings/server/handlers/recordingStatusChange.js
bigbluebutton-html5/imports/api/polls/server/methods.js 1 addition, 1 deletion

bigbluebutton-html5/imports/api/polls/server/methods.js
bigbluebutton-html5/imports/api/presentations/server/modifiers/removePresentation.js 3 additions, 2 deletions

.../api/presentations/server/modifiers/removePresentation.js
bigbluebutton-html5/imports/api/users/server/handlers/emojiStatus.js 4 additions, 3 deletions

...on-html5/imports/api/users/server/handlers/emojiStatus.js

with 233 additions and 48 deletions

Please register or to comment