Unverified Commit 63d43da7 authored 6 years ago by Richard Alam Committed by GitHub 6 years ago

Merge pull request #5770 from ritzalam/merge-latest-20-branch

Merge latest 20 branch

parents e2133a42 d3af675e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/SyncGetUsersMeetingRespMsgHdlr.scala 14 additions, 3 deletions

...tton/core/apps/users/SyncGetUsersMeetingRespMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserJoinMeetingAfterReconnectReqMsgHdlr.scala 1 addition, 1 deletion

.../apps/users/UserJoinMeetingAfterReconnectReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserJoinMeetingReqMsgHdlr.scala 1 addition, 1 deletion

...luebutton/core/apps/users/UserJoinMeetingReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ValidateAuthTokenReqMsgHdlr.scala 1 addition, 1 deletion

...ebutton/core/apps/users/ValidateAuthTokenReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala 16 additions, 5 deletions

...rc/main/scala/org/bigbluebutton/core/models/Users2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala 3 additions, 2 deletions

...scala/org/bigbluebutton/core/running/HandlerHelpers.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/UserJoinedMeetingEvtMsgBuilder.scala 4 additions, 2 deletions

...ore2/message/senders/UserJoinedMeetingEvtMsgBuilder.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala 1 addition, 2 deletions

...scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoder.java 2 additions, 2 deletions

...ava/org/bigbluebutton/transcode/core/VideoTranscoder.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegCommand.java 15 additions, 0 deletions

...rg/bigbluebutton/transcode/core/ffmpeg/FFmpegCommand.java
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala 8 additions, 6 deletions

.../main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 11 additions, 4 deletions

...b/src/main/java/org/bigbluebutton/api/MeetingService.java
bbb-common-web/src/main/java/org/bigbluebutton/api/domain/User.java 15 additions, 4 deletions

...-web/src/main/java/org/bigbluebutton/api/domain/User.java
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/UserJoined.java 12 additions, 2 deletions

.../org/bigbluebutton/api/messaging/messages/UserJoined.java
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala 2 additions, 1 deletion

...g/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
bbb-common-web/src/test/resources/get-meeting-info.ftlx 1 addition, 0 deletions

bbb-common-web/src/test/resources/get-meeting-info.ftlx
bbb-common-web/src/test/resources/get-meetings.ftlx 1 addition, 0 deletions

bbb-common-web/src/test/resources/get-meetings.ftlx
bigbluebutton-client/.gitignore 0 additions, 1 deletion

bigbluebutton-client/.gitignore
bigbluebutton-client/branding/default/style/css/V2Theme.css 1 addition, 10 deletions

bigbluebutton-client/branding/default/style/css/V2Theme.css
bigbluebutton-client/locale/.gitignore 0 additions, 1 deletion

bigbluebutton-client/locale/.gitignore

with 109 additions and 48 deletions

Please register or to comment