Commit 8f4ca962 authored 8 years ago by Felipe Cecagno

Merge branch 'undo-stack-size' of github.com:pedrobmarin/bigbluebutton into mconf

Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java

parents 1ff4d582 e87420e4

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/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java 1 addition, 0 deletions

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

...ton/core/pubsub/receivers/SharedNotesMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 4 additions, 0 deletions

...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala 2 additions, 0 deletions

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

...ain/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala 1 addition, 0 deletions

...src/main/scala/org/bigbluebutton/core/api/Constants.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala 1 addition, 0 deletions

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

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

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

...in/scala/org/bigbluebutton/core/apps/SharedNotesApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/SharedNotesModel.scala 20 additions, 2 deletions

.../scala/org/bigbluebutton/core/apps/SharedNotesModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/SharedNotesMessageToJsonConverter.scala 12 additions, 0 deletions

...re/pubsub/senders/SharedNotesMessageToJsonConverter.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java 1 addition, 0 deletions

...ain/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SharedNotesSyncNoteReplyMessage.java 68 additions, 0 deletions

...tton/common/messages/SharedNotesSyncNoteReplyMessage.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SharedNotesSyncNoteRequestMessage.java 58 additions, 0 deletions

...on/common/messages/SharedNotesSyncNoteRequestMessage.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java 14 additions, 7 deletions

...src/main/java/org/bigbluebutton/common/messages/Util.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/SharedNotesClientMessageSender.java 20 additions, 0 deletions

...luebutton/red5/client/SharedNotesClientMessageSender.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java 5 additions, 0 deletions

.../java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/SharedNotesApplication.java 4 additions, 0 deletions

...rg/bigbluebutton/red5/service/SharedNotesApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/SharedNotesService.java 10 additions, 0 deletions

...va/org/bigbluebutton/red5/service/SharedNotesService.java

with 247 additions and 9 deletions

Please register or to comment