Commit 715a0177 authored 7 years ago by Richard Alam

Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0

parents 5a155e5c f1e7e702

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/HidePollResultReqMsgHdlr.scala 0 additions, 37 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/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/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-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java 27 additions, 1 deletion

.../main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bigbluebutton-client/locale/en_US/bbbResources.properties 1 addition, 0 deletions

bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/resources/prod/BigBlueButton.html 4 additions, 4 deletions

bigbluebutton-client/resources/prod/BigBlueButton.html
bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as 0 additions, 2 deletions

...client/src/org/bigbluebutton/main/events/ShortcutEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml 10 additions, 1 deletion

...rc/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml 24 additions, 0 deletions

...ent/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/polling/events/ShowPollResultEvent.as 1 addition, 4 deletions

...gbluebutton/modules/polling/events/ShowPollResultEvent.as

with 283 additions and 97 deletions

Please register or to comment