Merge remote-tracking branch 'upstream/master' into clean-up-action-bar-buttons
No related branches found
No related tags found
Showing
- akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala 3 additions, 2 deletions...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala 1 addition, 0 deletions...on/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/RegisteredUsers.scala 39 additions, 12 deletions...scala/org/bigbluebutton/core/models/RegisteredUsers.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala 10 additions, 0 deletions...scala/org/bigbluebutton/core/running/HandlerHelpers.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 18 additions, 2 deletions...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/util/TimeUtil.scala 4 additions, 0 deletions...src/main/scala/org/bigbluebutton/core/util/TimeUtil.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala 1 addition, 0 deletions...c/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala 9 additions, 0 deletions.../org/bigbluebutton/core2/message/senders/MsgBuilder.scala
- akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala 2 additions, 1 deletion.../test/scala/org/bigbluebutton/core/AppsTestFixtures.scala
- akka-bbb-apps/src/universal/conf/application.conf 3 additions, 1 deletionakka-bbb-apps/src/universal/conf/application.conf
- bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/BreakoutMsgs.scala 3 additions, 3 deletions...n/scala/org/bigbluebutton/common2/msgs/BreakoutMsgs.scala
- bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala 5 additions, 0 deletions.../main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala
- bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 13 additions, 12 deletions...b/src/main/java/org/bigbluebutton/api/MeetingService.java
- bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java 7 additions, 6 deletions...bluebutton/api/messaging/messages/CreateBreakoutRoom.java
- bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java 28 additions, 19 deletions...ton/presentation/imp/PdfToSwfSlidesGenerationService.java
- bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala 2 additions, 2 deletions...org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala
- bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala 1 addition, 0 deletions...g/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
- bigbluebutton-config/bin/apply-lib.sh 2 additions, 2 deletionsbigbluebutton-config/bin/apply-lib.sh
- bigbluebutton-config/bin/bbb-conf 1566 additions, 1761 deletionsbigbluebutton-config/bin/bbb-conf
- bigbluebutton-html5/.gitignore 1 addition, 13 deletionsbigbluebutton-html5/.gitignore
Loading
Please register or sign in to comment