Commit 1d177e65 authored 9 years ago by Richard Alam

- fix merge issues

parent 151d790b

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java 1 addition, 1 deletion

...g/bigbluebutton/red5/service/PresentationApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java 16 additions, 23 deletions

...a/org/bigbluebutton/red5/service/PresentationService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/WhiteboardApplication.java 1 addition, 1 deletion

...org/bigbluebutton/red5/service/WhiteboardApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/WhiteboardService.java 21 additions, 25 deletions

...ava/org/bigbluebutton/red5/service/WhiteboardService.java
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml 50 additions, 51 deletions

bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala 1 addition, 1 deletion

...rg/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ChatMessageToJsonConverter.scala 1 addition, 1 deletion

...tton/core/pubsub/senders/ChatMessageToJsonConverter.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/WhiteboardEventRedisPublisher.scala 0 additions, 2 deletions

...n/core/pubsub/senders/WhiteboardEventRedisPublisher.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/ChatEventRedisRecorder.scala 2 additions, 2 deletions

...bigbluebutton/core/recorders/ChatEventRedisRecorder.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/PresentationEventRedisRecorder.scala 7 additions, 8 deletions

...utton/core/recorders/PresentationEventRedisRecorder.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/UsersEventRedisRecorder.scala 12 additions, 12 deletions

...igbluebutton/core/recorders/UsersEventRedisRecorder.scala
labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala 6 additions, 7 deletions

...ebutton/core/recorders/WhiteboardEventRedisRecorder.scala
labs/akka-bbb-fs/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala 0 additions, 1 deletion

...org/bigbluebutton/freeswitch/VoiceConferenceService.scala
labs/akka-bbb-fs/src/test/scala/org/bigbluebutton/apps/MeetingManagerSpec.scala 0 additions, 54 deletions

...est/scala/org/bigbluebutton/apps/MeetingManagerSpec.scala
labs/akka-bbb-fs/src/test/scala/org/bigbluebutton/apps/MeetingManagerTestFixtures.scala 0 additions, 12 deletions

...a/org/bigbluebutton/apps/MeetingManagerTestFixtures.scala
labs/akka-bbb-fs/src/test/scala/org/bigbluebutton/apps/MeetingManagerUnitSpec.scala 0 additions, 42 deletions

...scala/org/bigbluebutton/apps/MeetingManagerUnitSpec.scala
labs/akka-bbb-fs/src/test/scala/org/bigbluebutton/apps/RunningMeetingActorSpec.scala 0 additions, 57 deletions

...cala/org/bigbluebutton/apps/RunningMeetingActorSpec.scala
labs/akka-bbb-fs/src/test/scala/org/bigbluebutton/apps/TestKitUsageSpec.scala 0 additions, 154 deletions

.../test/scala/org/bigbluebutton/apps/TestKitUsageSpec.scala
labs/akka-bbb-fs/src/test/scala/org/bigbluebutton/apps/UnitSpec.scala 0 additions, 8 deletions

...b-fs/src/test/scala/org/bigbluebutton/apps/UnitSpec.scala
labs/akka-bbb-fs/src/test/scala/org/bigbluebutton/apps/models/UsersAppSpec.scala 0 additions, 18 deletions

...st/scala/org/bigbluebutton/apps/models/UsersAppSpec.scala

with 118 additions and 480 deletions

Please register or to comment