Commit 1e492dba authored 7 years ago by Anton Georgiev

Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-webcam-state

parents 1dc5de16 39c6a07b

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 4 additions, 0 deletions

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 3 additions, 3 deletions

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala 0 additions, 2 deletions

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

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

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

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

.../org/bigbluebutton/core2/message/senders/MsgBuilder.scala
bbb-apps-common/src/main/scala/org/bigbluebutton/client/SystemConfiguration.scala 4 additions, 0 deletions

.../scala/org/bigbluebutton/client/SystemConfiguration.scala
bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/AppsRedisSubscriberActor.scala 2 additions, 2 deletions

...tton/client/endpoint/redis/AppsRedisSubscriberActor.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala 9 additions, 4 deletions

...ain/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala
bbb-common-web/src/main/java/org/bigbluebutton/web/services/KeepAliveService.java 1 addition, 2 deletions

...java/org/bigbluebutton/web/services/KeepAliveService.java
bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala 3 additions, 0 deletions

...rc/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala 9 additions, 0 deletions

...eb/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala 2 additions, 2 deletions

...org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala 2 additions, 2 deletions

...g/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
bigbluebutton-client/branding/default/style/css/V2Theme.css 28 additions, 10 deletions

bigbluebutton-client/branding/default/style/css/V2Theme.css
bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla 0 additions, 0 deletions

...-client/branding/default/style/css/assets/swf/v2_skin.fla
bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf 0 additions, 0 deletions

...-client/branding/default/style/css/assets/swf/v2_skin.swf
bigbluebutton-client/src/org/bigbluebutton/core/Options.as 1 addition, 1 deletion

bigbluebutton-client/src/org/bigbluebutton/core/Options.as
bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as 3 additions, 3 deletions

...ent/src/org/bigbluebutton/core/managers/ConfigManager2.as

with 129 additions and 36 deletions

Please register or to comment