Commit 8eb7bc9e authored 10 years ago by Chad Pilkey

Merge remote-tracking branch 'upstream/master' into fix-issue-1866

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as

parents d4b4950a 078f4f1d

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-apps/build.gradle 1 addition, 0 deletions

bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java 9 additions, 38 deletions

...rg/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java 7 additions, 1 deletion

...va/org/bigbluebutton/conference/BigBlueButtonSession.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java 16 additions, 4 deletions

...ence/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java 1 addition, 1 deletion

...ference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java 0 additions, 20 deletions

.../conference/service/participants/ParticipantsHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java 5 additions, 2 deletions

.../conference/service/participants/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java 1 addition, 1 deletion

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

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 2 additions, 2 deletions

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

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

...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala 0 additions, 1 deletion

.../main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala 6 additions, 3 deletions

.../scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/red5/LayoutClientMessageSender.scala 0 additions, 0 deletions

...ton/core/apps/layout/red5/LayoutClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala 9 additions, 9 deletions

...in/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala 2 additions, 2 deletions

...utton/core/apps/users/red5/UsersClientMessageSender.scala
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as 4 additions, 1 deletion

...igbluebutton/modules/videoconf/business/VideoWindowItf.as

with 67 additions and 89 deletions

Please register or to comment