Unverified Commit 5859e297 authored 4 years ago by Anton Georgiev Committed by GitHub 4 years ago

Merge pull request #9429 from antobinary/merge-2.2-into-develop

Merge 2.2 into develop, May 5, 2020

parents d3935fc3 cc79c4b6

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/EjectUserFromMeetingCmdMsgHdlr.scala 27 additions, 4 deletions

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

...in/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ValidateAuthTokenReqMsgHdlr.scala 48 additions, 11 deletions

...ebutton/core/apps/users/ValidateAuthTokenReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala 26 additions, 14 deletions

...utton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/RegisteredUsers.scala 55 additions, 4 deletions

...scala/org/bigbluebutton/core/models/RegisteredUsers.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala 1 addition, 0 deletions

...rc/main/scala/org/bigbluebutton/core/models/Users2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsers.scala 20 additions, 1 deletion

...main/scala/org/bigbluebutton/core/models/VoiceUsers.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/EjectUserFromVoiceCmdMsgHdlr.scala 1 addition, 0 deletions

...core2/message/handlers/EjectUserFromVoiceCmdMsgHdlr.scala
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java 15 additions, 3 deletions

...ebutton/freeswitch/voice/freeswitch/ESLEventListener.java
bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java 26 additions, 3 deletions

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

...src/main/java/org/bigbluebutton/api/RecordingService.java
bbb-common-web/src/main/java/org/bigbluebutton/api/Util.java 107 additions, 26 deletions

bbb-common-web/src/main/java/org/bigbluebutton/api/Util.java
bbb-common-web/src/main/java/org/bigbluebutton/api/util/ParamsUtil.java 4 additions, 0 deletions

.../src/main/java/org/bigbluebutton/api/util/ParamsUtil.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/DocumentConversionServiceImp.java 51 additions, 44 deletions

...bluebutton/presentation/DocumentConversionServiceImp.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java 30 additions, 28 deletions

...uebutton/presentation/PresentationUrlDownloadService.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/UploadedPresentation.java 17 additions, 1 deletion

.../org/bigbluebutton/presentation/UploadedPresentation.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PresentationFileProcessor.java 15 additions, 0 deletions

...luebutton/presentation/imp/PresentationFileProcessor.java
bigbluebutton-config/cron.daily/bigbluebutton 2 additions, 1 deletion

bigbluebutton-config/cron.daily/bigbluebutton
bigbluebutton-html5/.gitignore 2 additions, 0 deletions

bigbluebutton-html5/.gitignore
bigbluebutton-html5/imports/api/captions/server/methods/appendText.js 3 additions, 3 deletions

...n-html5/imports/api/captions/server/methods/appendText.js

with 484 additions and 164 deletions

Please register or to comment