Commit 76e7e6d5 authored 8 years ago by Richard Alam

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into...

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc

parents 1da50feb 4f4f2a71

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/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala 1 addition, 1 deletion

...scala/org/bigbluebutton/core/JsonMessageSenderActor.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/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/BreakoutRoomApp.scala 1 addition, 1 deletion

...n/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomRequestPayload.java 3 additions, 3 deletions

...on/messages/payload/CreateBreakoutRoomRequestPayload.java
bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomsRequestPayload.java 3 additions, 3 deletions

...n/messages/payload/CreateBreakoutRoomsRequestPayload.java
bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomRequestTest.java 3 additions, 3 deletions

...bigbluebutton/messages/CreateBreakoutRoomRequestTest.java
bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsRequestTest.java 3 additions, 3 deletions

...igbluebutton/messages/CreateBreakoutRoomsRequestTest.java
bigbluebutton-client/locale/en_US/bbbResources.properties 0 additions, 3 deletions

bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/events/BreakoutRoomEvent.as 1 addition, 1 deletion

...nt/src/org/bigbluebutton/main/events/BreakoutRoomEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as 13 additions, 4 deletions

...ient/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as 1 addition, 1 deletion

...ent/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml 17 additions, 11 deletions

...ent/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml 8 additions, 6 deletions

...-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/TextTab.as 37 additions, 19 deletions

...nt/src/org/bigbluebutton/modules/caption/views/TextTab.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml 2 additions, 1 deletion

...ebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as 2 additions, 2 deletions

...org/bigbluebutton/modules/users/services/MessageSender.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml 8 additions, 14 deletions

...gbluebutton/modules/users/views/BreakoutRoomSettings.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/RoomActionsRenderer.mxml 21 additions, 5 deletions

...igbluebutton/modules/users/views/RoomActionsRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml 1 addition, 0 deletions

...rc/org/bigbluebutton/modules/users/views/UsersWindow.mxml

with 127 additions and 83 deletions

Please register or to comment