Commit 9818fca2 authored 7 years ago by Anton Georgiev

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4

parents 81d643bc c01d2209

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/PermissionCheck.scala 1 addition, 2 deletions

...n/scala/org/bigbluebutton/core/apps/PermissionCheck.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ClearPublicChatHistoryPubMsgHdlr.scala 11 additions, 3 deletions

...ton/core/apps/chat/ClearPublicChatHistoryPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/BroadcastLayoutMsgHdlr.scala 12 additions, 4 deletions

...gbluebutton/core/apps/layout/BroadcastLayoutMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/AddUserToPresenterGroupCmdMsgHdlr.scala 16 additions, 9 deletions

...n/core/apps/users/AddUserToPresenterGroupCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/AssignPresenterReqMsgHdlr.scala 18 additions, 11 deletions

...luebutton/core/apps/users/AssignPresenterReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala 5 additions, 5 deletions

...re/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserEmojiCmdMsgHdlr.scala 13 additions, 5 deletions

...luebutton/core/apps/users/ChangeUserEmojiCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala 14 additions, 7 deletions

...bluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/EjectUserFromMeetingCmdMsgHdlr.scala 43 additions, 36 deletions

...tton/core/apps/users/EjectUserFromMeetingCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/LockUserInMeetingCmdMsgHdlr.scala 13 additions, 6 deletions

...ebutton/core/apps/users/LockUserInMeetingCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/LockUsersInMeetingCmdMsgHdlr.scala 15 additions, 9 deletions

...button/core/apps/users/LockUsersInMeetingCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/LogoutAndEndMeetingCmdMsgHdlr.scala 15 additions, 8 deletions

...utton/core/apps/users/LogoutAndEndMeetingCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala 6 additions, 6 deletions

...rg/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RemoveUserFromPresenterGroupCmdMsgHdlr.scala 16 additions, 9 deletions

...e/apps/users/RemoveUserFromPresenterGroupCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/SetRecordingStatusCmdMsgHdlr.scala 17 additions, 9 deletions

...button/core/apps/users/SetRecordingStatusCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteMeetingCmdMsgHdlr.scala 5 additions, 5 deletions

...button/core2/message/handlers/MuteMeetingCmdMsgHdlr.scala
bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java 2 additions, 1 deletion

...uebutton/presentation/PresentationUrlDownloadService.java
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala 0 additions, 2 deletions

...g/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64-svc2.jar 0 additions, 0 deletions

bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64-svc2.jar
bbb-screenshare/app/jws/lib/ffmpeg-macosx-x86_64-svc2.jar 0 additions, 0 deletions

bbb-screenshare/app/jws/lib/ffmpeg-macosx-x86_64-svc2.jar

with 222 additions and 137 deletions

Please register or to comment