Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton...
Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1 Conflicts: bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
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/UsersMessageReceiver.java 11 additions, 1 deletion...luebutton/core/pubsub/receivers/UsersMessageReceiver.java
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 5 additions, 0 deletions...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala 10 additions, 0 deletions...s/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala 1 addition, 0 deletions.../src/main/scala/org/bigbluebutton/core/MeetingActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala 11 additions, 0 deletions...ain/scala/org/bigbluebutton/core/MessageSenderActor.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/OutMessages.scala 1 addition, 0 deletions...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
- bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AllowUserToShareDesktopReply.java 66 additions, 0 deletions...ebutton/common/messages/AllowUserToShareDesktopReply.java
- bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AllowUserToShareDesktopRequest.java 58 additions, 0 deletions...utton/common/messages/AllowUserToShareDesktopRequest.java
- bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MeetingCreatedMessage.java 49 additions, 0 deletions.../bigbluebutton/common/messages/MeetingCreatedMessage.java
- bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MeetingDestroyedMessage.java 49 additions, 0 deletions...igbluebutton/common/messages/MeetingDestroyedMessage.java
- bbb-screenshare/app/build.sbt 4 additions, 6 deletionsbbb-screenshare/app/build.sbt
- bbb-screenshare/app/deploy.sh 8 additions, 6 deletionsbbb-screenshare/app/deploy.sh
- bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/IScreenShareApplication.java 11 additions, 4 deletions...igbluebutton/app/screenshare/IScreenShareApplication.java
- bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/IsScreenSharingResponse.java 0 additions, 12 deletions...igbluebutton/app/screenshare/IsScreenSharingResponse.java
- bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/StartShareRequestResponse.java 0 additions, 16 deletions...bluebutton/app/screenshare/StartShareRequestResponse.java
- bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/events/IsScreenSharingResponse.java 18 additions, 0 deletions...utton/app/screenshare/events/IsScreenSharingResponse.java
- bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/events/StartShareRequestFailedResponse.java 14 additions, 0 deletions...p/screenshare/events/StartShareRequestFailedResponse.java
- bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/events/StartShareRequestResponse.java 20 additions, 0 deletions...ton/app/screenshare/events/StartShareRequestResponse.java
Loading
Please register or sign in to comment