Commit 76c4bb6c authored 4 years ago by Ramon Souza

Merge remote-tracking branch 'upstream/develop' into pr-11408

parents 91f6bc75 11110967

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala 1 addition, 0 deletions

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/PollApp2x.scala 1 addition, 0 deletions

...n/scala/org/bigbluebutton/core/apps/polls/PollApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/RespondToTypedPollReqMsgHdlr.scala 51 additions, 0 deletions

...button/core/apps/polls/RespondToTypedPollReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/StartCustomPollReqMsgHdlr.scala 2 additions, 2 deletions

...luebutton/core/apps/polls/StartCustomPollReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/StartPollReqMsgHdlr.scala 2 additions, 2 deletions

...g/bigbluebutton/core/apps/polls/StartPollReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala 4 additions, 4 deletions

...igbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ValidateAuthTokenReqMsgHdlr.scala 4 additions, 4 deletions

...ebutton/core/apps/users/ValidateAuthTokenReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala 17 additions, 2 deletions

...in/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/GuestsWaiting.scala 1 addition, 1 deletion

...n/scala/org/bigbluebutton/core/models/GuestsWaiting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala 76 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 2 additions, 0 deletions

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

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala 29 additions, 4 deletions

.../org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala 4 additions, 4 deletions

.../org/bigbluebutton/core2/message/senders/MsgBuilder.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/ValidateAuthTokenRespMsgSender.scala 2 additions, 2 deletions

...ore2/message/senders/ValidateAuthTokenRespMsgSender.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala 2 additions, 2 deletions

...scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
akka-bbb-apps/src/universal/conf/application.conf 2 additions, 0 deletions

akka-bbb-apps/src/universal/conf/application.conf
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/GetUsersStatusCommand.java 4 additions, 2 deletions

...witch/voice/freeswitch/actions/GetUsersStatusCommand.java
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/GuestsMsgs.scala 1 addition, 1 deletion

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

...main/scala/org/bigbluebutton/common2/msgs/PollsMsgs.scala

with 219 additions and 54 deletions

Please register or to comment