Merge remote-tracking branch 'bigbluebutton/master' into jvm-quality-improve
# Conflicts: # bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
No related branches found
No related tags found
Showing
- akka-bbb-apps/.dockerignore 2 additions, 0 deletionsakka-bbb-apps/.dockerignore
- akka-bbb-apps/Dockerfile 24 additions, 0 deletionsakka-bbb-apps/Dockerfile
- akka-bbb-apps/src/main/resources/application.conf 5 additions, 0 deletionsakka-bbb-apps/src/main/resources/application.conf
- akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala 2 additions, 0 deletions...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala 3 additions, 2 deletions...n/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp2x.scala 2 additions, 1 deletion...in/scala/org/bigbluebutton/core/apps/chat/ChatApp2x.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/UserTypingPubMsgHdlr.scala 21 additions, 0 deletions...g/bigbluebutton/core/apps/chat/UserTypingPubMsgHdlr.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RecordAndClearPreviousMarkersCmdMsgHdlr.scala 4 additions, 1 deletion.../apps/users/RecordAndClearPreviousMarkersCmdMsgHdlr.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/SyncGetVoiceUsersMsgHdlr.scala 34 additions, 0 deletions...bluebutton/core/apps/voice/SyncGetVoiceUsersMsgHdlr.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp2x.scala 2 additions, 1 deletion.../scala/org/bigbluebutton/core/apps/voice/VoiceApp2x.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/record/events/RecordStatusResetEvent.scala 39 additions, 0 deletions...luebutton/core/record/events/RecordStatusResetEvent.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 43 additions, 48 deletions...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala 2 additions, 1 deletion.../org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala 10 additions, 0 deletions.../org/bigbluebutton/core2/message/senders/MsgBuilder.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala 10 additions, 0 deletions...org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
- akka-bbb-fsesl/Dockerfile 26 additions, 0 deletionsakka-bbb-fsesl/Dockerfile
- akka-bbb-fsesl/wait-for-it.sh 177 additions, 0 deletionsakka-bbb-fsesl/wait-for-it.sh
- bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/AllowedMessageNames.scala 1 addition, 0 deletions...rg/bigbluebutton/client/meeting/AllowedMessageNames.scala
- bbb-common-message/Dockerfile 13 additions, 0 deletionsbbb-common-message/Dockerfile
Loading
Please register or sign in to comment