Commit c11cea76 authored 9 years ago by RafaFP

Merge remote-tracking branch 'mconf/mconf-live0.7.3' into fix-1822

refs #1822

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml

parents 370a1a6b 15acb57b

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java 16 additions, 5 deletions

...rg/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/UserConnectionMapper.java 88 additions, 0 deletions

...va/org/bigbluebutton/conference/UserConnectionMapper.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java 29 additions, 9 deletions

...ence/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharednotes/SharedNotesApplication.java 2 additions, 2 deletions

...onference/service/sharednotes/SharedNotesApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharednotes/SharedNotesService.java 1 addition, 3 deletions

...on/conference/service/sharednotes/SharedNotesService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java 1 addition, 2 deletions

...n/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 2 additions, 3 deletions

...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala 1 addition, 3 deletions

...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala 0 additions, 2 deletions

...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/sharednotes/SharedNotesApp.scala 1 addition, 1 deletion

.../bigbluebutton/core/apps/sharednotes/SharedNotesApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/sharednotes/SharedNotesInGateway.scala 2 additions, 3 deletions

...uebutton/core/apps/sharednotes/SharedNotesInGateway.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/sharednotes/red5/SharedNotesClientMessageSender.scala 0 additions, 2 deletions

...pps/sharednotes/red5/SharedNotesClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala 4 additions, 3 deletions

...in/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala 4 additions, 0 deletions

.../scala/org/bigbluebutton/core/apps/users/UsersModel.scala
bigbluebutton-client/locale/en_US/bbbResources.properties 2 additions, 1 deletion

bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties 1 addition, 0 deletions

bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/resources/prod/BigBlueButtonTest.html 1 addition, 5 deletions

bigbluebutton-client/resources/prod/BigBlueButtonTest.html
bigbluebutton-client/resources/prod/DeskshareStandalone.html 1 addition, 1 deletion

bigbluebutton-client/resources/prod/DeskshareStandalone.html
bigbluebutton-client/resources/prod/EmbedBigBlueButton.html 1 addition, 1 deletion

bigbluebutton-client/resources/prod/EmbedBigBlueButton.html
bigbluebutton-client/resources/prod/MconfLive.html 27 additions, 2 deletions

bigbluebutton-client/resources/prod/MconfLive.html

with 184 additions and 48 deletions

Please register or to comment