-
- Downloads
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1
Conflicts: akka-bbb-apps/build.sbt akka-bbb-fsesl/build.sbt bbb-common-message/build.sbt bigbluebutton-apps/build.gradle
Showing
- akka-bbb-apps/build.sbt 2 additions, 2 deletionsakka-bbb-apps/build.sbt
- akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java 1 addition, 2 deletions...n/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
- akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java 7 additions, 18 deletions...luebutton/core/pubsub/receivers/UsersMessageReceiver.java
- akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/RedisDispatcher.java 13 additions, 1 deletion.../bigbluebutton/core/service/recorder/RedisDispatcher.java
- akka-bbb-apps/src/main/resources/logback.xml 1 addition, 1 deletionakka-bbb-apps/src/main/resources/logback.xml
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 11 additions, 8 deletions...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 4 additions, 8 deletions...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala 8 additions, 10 deletions.../src/main/scala/org/bigbluebutton/core/MeetingActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala 3 additions, 9 deletions...ain/scala/org/bigbluebutton/core/MessageSenderActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala 3 additions, 10 deletions...src/main/scala/org/bigbluebutton/core/RecorderActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala 1 addition, 2 deletions...src/main/scala/org/bigbluebutton/core/api/Constants.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala 3 additions, 4 deletions...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala 2 additions, 4 deletions.../main/scala/org/bigbluebutton/core/api/MessageNames.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala 1 addition, 2 deletions...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala 6 additions, 4 deletions.../main/scala/org/bigbluebutton/core/api/ValueObjects.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/Poll.scala 5 additions, 4 deletions...pps/src/main/scala/org/bigbluebutton/core/apps/Poll.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala 172 additions, 87 deletions...src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Values.scala 1 addition, 1 deletion...src/main/scala/org/bigbluebutton/core/models/Values.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/UsersEventRedisPublisher.scala 0 additions, 259 deletions...button/core/pubsub/senders/UsersEventRedisPublisher.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/UsersMessageToJsonConverter.scala 6 additions, 17 deletions...ton/core/pubsub/senders/UsersMessageToJsonConverter.scala
Loading
Please register or sign in to comment