Commit 240176ca authored 7 years ago by Richard Alam

Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into...

Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web

parents 272df3c2 7a60aec8

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java 2 additions, 2 deletions

...n/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PresentationMessageListener.java 0 additions, 4 deletions

...on/core/pubsub/receivers/PresentationMessageListener.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/WhiteboardMessageReceiver.java 4 additions, 0 deletions

...tton/core/pubsub/receivers/WhiteboardMessageReceiver.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/recorders/events/CursorUpdateRecordEvent.java 5 additions, 1 deletion

...button/core/recorders/events/CursorUpdateRecordEvent.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 4 additions, 4 deletions

...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala 6 additions, 6 deletions

...ain/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala 1 addition, 1 deletion

...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala 1 addition, 1 deletion

.../main/scala/org/bigbluebutton/core/api/MessageNames.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala 1 addition, 1 deletion

...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PresentationApp.scala 0 additions, 7 deletions

...n/scala/org/bigbluebutton/core/apps/PresentationApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PresentationModel.scala 0 additions, 1 deletion

...scala/org/bigbluebutton/core/apps/PresentationModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala 4 additions, 0 deletions

...ain/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala 1 addition, 1 deletion

...n/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala 0 additions, 10 deletions

...re/pubsub/senders/PesentationMessageToJsonConverter.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/WhiteboardMessageToJsonConverter.scala 11 additions, 0 deletions

...ore/pubsub/senders/WhiteboardMessageToJsonConverter.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorder/RecorderActor.scala 518 additions, 486 deletions

...scala/org/bigbluebutton/core/recorder/RecorderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 1 addition, 1 deletion

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
bbb-api-demo/src/main/webapp/demoHTML5.jsp 11 additions, 2 deletions

bbb-api-demo/src/main/webapp/demoHTML5.jsp
bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/PresentationClientMessageSender.java 0 additions, 21 deletions

...uebutton/red5/client/PresentationClientMessageSender.java
bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/WhiteboardClientMessageSender.java 21 additions, 0 deletions

...bluebutton/red5/client/WhiteboardClientMessageSender.java

with 591 additions and 549 deletions

Please register or to comment