-
- Downloads
Merge branch 'breakout-rooms-porto-algre-2015' of...
Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
No related branches found
No related tags found
Showing
- akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java 32 additions, 28 deletions...ebutton/core/pubsub/receivers/MeetingMessageReceiver.java
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 0 additions, 1 deletion...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
- bbb-common-message/src/main/java/org/bigbluebutton/messages/ListenInOnBreakout.java 7 additions, 0 deletions...n/java/org/bigbluebutton/messages/ListenInOnBreakout.java
- bbb-common-message/src/main/java/org/bigbluebutton/messages/RequestBreakoutJoinURL.java 7 additions, 0 deletions...va/org/bigbluebutton/messages/RequestBreakoutJoinURL.java
- bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java 15 additions, 1 deletion.../java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
- bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java 25 additions, 0 deletions...a/org/bigbluebutton/red5/service/BreakoutRoomService.java
- bigbluebutton-client/locale/en_US/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/src/org/bigbluebutton/main/events/BreakoutRoomEvent.as 4 additions, 0 deletions...nt/src/org/bigbluebutton/main/events/BreakoutRoomEvent.as
- bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as 1 addition, 11 deletions...ient/src/org/bigbluebutton/main/model/users/Conference.as
- bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as 5 additions, 1 deletion...ent/src/org/bigbluebutton/main/model/users/UserService.as
- bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml 4 additions, 0 deletions...g/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as 4 additions, 1 deletion...g/bigbluebutton/modules/users/services/MessageReceiver.as
- bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as 14 additions, 1 deletion...org/bigbluebutton/modules/users/services/MessageSender.as
- bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml 1 addition, 0 deletions...gbluebutton/modules/users/views/BreakoutRoomSettings.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml 3 additions, 1 deletion.../bigbluebutton/modules/users/views/MediaItemRenderer.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/users/views/RoomActionsRenderer.mxml 18 additions, 2 deletions...igbluebutton/modules/users/views/RoomActionsRenderer.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml 10 additions, 4 deletions...rc/org/bigbluebutton/modules/users/views/UsersWindow.mxml
Loading
Please register or sign in to comment