Commit 2d222b7b authored 6 years ago by Lucas Fialho Zawacki

Merge branch 'v2.0.x-release' of...

Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into use-get-recording-status

parents c2801f44 8327e6fb

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutModel.scala 2 additions, 1 deletion

...ain/scala/org/bigbluebutton/core/apps/BreakoutModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomCreatedMsgHdlr.scala 2 additions, 2 deletions

...utton/core/apps/breakout/BreakoutRoomCreatedMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomsListMsgHdlr.scala 1 addition, 1 deletion

...ebutton/core/apps/breakout/BreakoutRoomsListMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala 2 additions, 1 deletion

...on/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/BreakoutRoom2x.scala 1 addition, 0 deletions

.../scala/org/bigbluebutton/core/domain/BreakoutRoom2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/BreakoutRooms.scala 3 additions, 3 deletions

...n/scala/org/bigbluebutton/core/models/BreakoutRooms.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala 0 additions, 1 deletion

...n/core/pubsub/senders/MeetingMessageToJsonConverter.scala
bbb-common-message/src/main/java/org/bigbluebutton/messages/CreateMeetingRequestPayload.java 4 additions, 1 deletion

...g/bigbluebutton/messages/CreateMeetingRequestPayload.java
bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala 1 addition, 1 deletion

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

...n/scala/org/bigbluebutton/common2/msgs/BreakoutMsgs.scala
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 4 additions, 1 deletion

...b/src/main/java/org/bigbluebutton/api/MeetingService.java
bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java 1 addition, 0 deletions

.../main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java 10 additions, 1 deletion

...b/src/main/java/org/bigbluebutton/api/domain/Meeting.java
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java 3 additions, 1 deletion

...bluebutton/api/messaging/messages/CreateBreakoutRoom.java
bbb-common-web/src/main/java/org/bigbluebutton/api/pub/IPublisherService.java 1 addition, 1 deletion

...ain/java/org/bigbluebutton/api/pub/IPublisherService.java
bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java 1 addition, 1 deletion

...src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala 2 additions, 1 deletion

...rc/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala 5 additions, 2 deletions

.../main/scala/org/bigbluebutton/api2/domain/Recording.scala
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala 1 addition, 1 deletion

...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

with 49 additions and 24 deletions

Please register or to comment