Commit 3a72afa3 authored 7 years ago by prlanzarin

Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection

parents 06f8b56a bc5df119

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/polls/HidePollResultReqMsgHdlr.scala 0 additions, 31 deletions

...bluebutton/core/apps/polls/HidePollResultReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/PollApp2x.scala 0 additions, 1 deletion

...n/scala/org/bigbluebutton/core/apps/polls/PollApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/RespondToPollReqMsgHdlr.scala 19 additions, 7 deletions

...gbluebutton/core/apps/polls/RespondToPollReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala 6 additions, 4 deletions

...rg/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserJoinMeetingAfterReconnectReqMsgHdlr.scala 0 additions, 1 deletion

.../apps/users/UserJoinMeetingAfterReconnectReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala 1 addition, 21 deletions

...g/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala 8 additions, 0 deletions

...utton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala 2 additions, 21 deletions

.../src/main/scala/org/bigbluebutton/core/models/Polls.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 0 additions, 2 deletions

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/AbstractPollRecordEvent.scala 34 additions, 0 deletions

...uebutton/core/record/events/AbstractPollRecordEvent.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/PollStartedRecordEvent.scala 42 additions, 0 deletions

...luebutton/core/record/events/PollStartedRecordEvent.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/PollStoppedRecordEvent.scala 24 additions, 0 deletions

...luebutton/core/record/events/PollStoppedRecordEvent.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/UserRespondedToPollRecordEvent.scala 39 additions, 0 deletions

...n/core/record/events/UserRespondedToPollRecordEvent.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 0 additions, 1 deletion

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala 9 additions, 1 deletion

.../org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteAllExceptPresentersCmdMsgHdlr.scala 17 additions, 16 deletions

.../message/handlers/MuteAllExceptPresentersCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/MuteMeetingCmdMsgHdlr.scala 13 additions, 11 deletions

...button/core2/message/handlers/MuteMeetingCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala 38 additions, 0 deletions

...org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PollsMsgs.scala 9 additions, 15 deletions

...main/scala/org/bigbluebutton/common2/msgs/PollsMsgs.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala 3 additions, 3 deletions

.../scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala

with 264 additions and 135 deletions

Please register or to comment