Commit adbe9bb5 authored 6 years ago by Anton Georgiev

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands

parents 615fca3a 81122251

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserJoinMeetingAfterReconnectReqMsgHdlr.scala 17 additions, 6 deletions

.../apps/users/UserJoinMeetingAfterReconnectReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserJoinMeetingReqMsgHdlr.scala 22 additions, 11 deletions

...luebutton/core/apps/users/UserJoinMeetingReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala 12 additions, 81 deletions

...g/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala 30 additions, 1 deletion

...rc/main/scala/org/bigbluebutton/core/models/Users2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala 20 additions, 19 deletions

...scala/org/bigbluebutton/core/running/HandlerHelpers.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 60 additions, 64 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala 4 additions, 1 deletion

...scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 26 additions, 4 deletions

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

.../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/RedisStorageService.java 7 additions, 5 deletions

.../org/bigbluebutton/api/messaging/RedisStorageService.java
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/UpdateRecordingStatus.java 11 additions, 0 deletions

...ebutton/api/messaging/messages/UpdateRecordingStatus.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/ImageToSwfSlide.java 1 addition, 1 deletion

.../java/org/bigbluebutton/presentation/ImageToSwfSlide.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/PdfToSwfSlide.java 1 addition, 1 deletion

...in/java/org/bigbluebutton/presentation/PdfToSwfSlide.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java 11 additions, 11 deletions

...uebutton/presentation/PresentationUrlDownloadService.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/handlers/AddNamespaceToSvgHandler.java 9 additions, 0 deletions

...utton/presentation/handlers/AddNamespaceToSvgHandler.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/handlers/Pdf2PngPageConverterHandler.java 1 addition, 4 deletions

...on/presentation/handlers/Pdf2PngPageConverterHandler.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/handlers/Pdf2SwfPageConverterHandler.java 3 additions, 0 deletions

...on/presentation/handlers/Pdf2SwfPageConverterHandler.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/handlers/PdfPageCounterHandler.java 1 addition, 0 deletions

...uebutton/presentation/handlers/PdfPageCounterHandler.java
bbb-common-web/src/main/java/org/bigbluebutton/presentation/handlers/Png2SvgConversionHandler.java 8 additions, 0 deletions

...utton/presentation/handlers/Png2SvgConversionHandler.java

with 255 additions and 211 deletions

Please register or to comment