Unverified Commit ece61e99 authored 6 years ago by Tainan Felipe Committed by GitHub 6 years ago

Merge branch 'master' into compability-to-npm

parents 0330f14f 65338025

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/resources/application.conf 0 additions, 12 deletions

akka-bbb-apps/src/main/resources/application.conf
akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala 0 additions, 3 deletions

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserActivitySignCmdMsgHdlr.scala 4 additions, 4 deletions

...uebutton/core/apps/users/UserActivitySignCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingInactivityTracker.scala 5 additions, 5 deletions

.../bigbluebutton/core/domain/MeetingInactivityTracker.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala 16 additions, 16 deletions

...rc/main/scala/org/bigbluebutton/core/models/Users2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 2 additions, 2 deletions

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 154 additions, 102 deletions

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

...c/main/scala/org/bigbluebutton/core2/AnalyticsActor.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/core2/message/senders/Sender.scala 8 additions, 6 deletions

...cala/org/bigbluebutton/core2/message/senders/Sender.scala
bbb-apps-common/src/main/scala/org/bigbluebutton/client/ClientGWApplication.scala 0 additions, 3 deletions

.../scala/org/bigbluebutton/client/ClientGWApplication.scala
bbb-apps-common/src/main/scala/org/bigbluebutton/client/SystemConfiguration.scala 0 additions, 1 deletion

.../scala/org/bigbluebutton/client/SystemConfiguration.scala
bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/AllowedMessageNames.scala 1 addition, 1 deletion

...rg/bigbluebutton/client/meeting/AllowedMessageNames.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala 4 additions, 3 deletions

...in/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala 6 additions, 6 deletions

.../main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 9 additions, 12 deletions

...b/src/main/java/org/bigbluebutton/api/MeetingService.java
bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java 34 additions, 5 deletions

.../main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java 26 additions, 0 deletions

...b/src/main/java/org/bigbluebutton/api/domain/Meeting.java
bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java 3 additions, 0 deletions

...src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala 14 additions, 8 deletions

...rc/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala

with 298 additions and 189 deletions

Please register or to comment