Commit 8ae1fd18 authored 7 years ago by Tainan Felipe

Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends

parents 2c48392b 9ff881f1

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
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/GetWebcamsOnlyForModeratorReqMsgHdlr.scala 29 additions, 0 deletions

...ore/apps/users/GetWebcamsOnlyForModeratorReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UpdateWebcamsOnlyForModeratorCmdMsgHdlr.scala 32 additions, 0 deletions

.../apps/users/UpdateWebcamsOnlyForModeratorCmdMsgHdlr.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/UsersApp.scala 2 additions, 0 deletions

...in/scala/org/bigbluebutton/core/apps/users/UsersApp.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/domain/MeetingStatus.scala 1 addition, 0 deletions

...n/scala/org/bigbluebutton/core/domain/MeetingStatus.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 4 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, 31 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/record/events/WebcamsOnlyForModeratorRecordEvent.scala 39 additions, 0 deletions

...re/record/events/WebcamsOnlyForModeratorRecordEvent.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 33 additions, 23 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala 1 addition, 0 deletions

...c/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala 9 additions, 1 deletion

.../org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala

with 319 additions and 118 deletions

Please register or to comment