Unverified Commit 5953f211 authored 4 years ago by Anton Georgiev Committed by GitHub 4 years ago

Merge pull request #11558 from antobinary/march4-merge

Merge 2.2.[32..35] into 'develop'

parents 088c3cde 228bad03

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/SystemConfiguration.scala 1 addition, 1 deletion

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/GetScreenBroadcastPermissionReqMsgHdlr.scala 40 additions, 0 deletions

.../screenshare/GetScreenBroadcastPermissionReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/GetScreenSubscribePermissionReqMsgHdlr.scala 38 additions, 0 deletions

.../screenshare/GetScreenSubscribePermissionReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/GetCamBroadcastPermissionReqMsgHdlr.scala 33 additions, 0 deletions

...core/apps/users/GetCamBroadcastPermissionReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/GetCamSubscribePermissionReqMsgHdlr.scala 41 additions, 0 deletions

...core/apps/users/GetCamSubscribePermissionReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/GetGlobalAudioPermissionReqMsgHdlr.scala 35 additions, 0 deletions

.../core/apps/voice/GetGlobalAudioPermissionReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 14 additions, 0 deletions

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 18 additions, 0 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/pads/AddCaptionsPadsSysMsgHdlr.scala 21 additions, 0 deletions

...re2/message/handlers/pads/AddCaptionsPadsSysMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/pads/AddPadSysMsgHdlr.scala 22 additions, 0 deletions

...button/core2/message/handlers/pads/AddPadSysMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala 127 additions, 0 deletions

.../org/bigbluebutton/core2/message/senders/MsgBuilder.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala 16 additions, 0 deletions

...ain/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala 89 additions, 1 deletion

.../scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WebcamsMsgs.scala 56 additions, 0 deletions

...in/scala/org/bigbluebutton/common2/msgs/WebcamsMsgs.scala
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 36 additions, 0 deletions

...b/src/main/java/org/bigbluebutton/api/MeetingService.java
bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java 20 additions, 0 deletions

...b/src/main/java/org/bigbluebutton/api/domain/Meeting.java
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/AddCaptionsPads.java 11 additions, 0 deletions

...bigbluebutton/api/messaging/messages/AddCaptionsPads.java
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/AddPad.java 13 additions, 0 deletions

...java/org/bigbluebutton/api/messaging/messages/AddPad.java
bbb-common-web/src/main/java/org/bigbluebutton/api/util/ParamsUtil.java 17 additions, 0 deletions

.../src/main/java/org/bigbluebutton/api/util/ParamsUtil.java
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala 4 additions, 0 deletions

...org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala

with 652 additions and 2 deletions

Please register or to comment