-
- Downloads
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into...
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
Showing
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala 17 additions, 0 deletions...rc/main/scala/org/bigbluebutton/core/CollectorActor.scala
- bigbluebutton-html5/app/.meteor/packages 1 addition, 1 deletionbigbluebutton-html5/app/.meteor/packages
- bigbluebutton-html5/app/.meteor/versions 2 additions, 2 deletionsbigbluebutton-html5/app/.meteor/versions
- bigbluebutton-html5/app/client/main.html 26 additions, 23 deletionsbigbluebutton-html5/app/client/main.html
- bigbluebutton-html5/app/client/stylesheets/style.less 76 additions, 15 deletionsbigbluebutton-html5/app/client/stylesheets/style.less
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy 17 additions, 0 deletions...rs/org/bigbluebutton/web/controllers/ApiController.groovy
- bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java 112 additions, 4 deletions...on-web/src/java/org/bigbluebutton/api/MeetingService.java
- bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java 25 additions, 0 deletions...-web/src/java/org/bigbluebutton/api/RecordingService.java
- bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java 27 additions, 1 deletion...on-web/src/java/org/bigbluebutton/api/domain/Meeting.java
- bigbluebutton-web/src/java/org/bigbluebutton/api/domain/User.java 47 additions, 0 deletions...utton-web/src/java/org/bigbluebutton/api/domain/User.java
- bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java 50 additions, 8 deletions...rg/bigbluebutton/api/messaging/MeetingMessageHandler.java
- bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java 5 additions, 1 deletion...a/org/bigbluebutton/api/messaging/MessagingConstants.java
- bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/UserJoinedVoice.java 11 additions, 0 deletions...bigbluebutton/api/messaging/messages/UserJoinedVoice.java
- bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/UserLeftVoice.java 11 additions, 0 deletions...g/bigbluebutton/api/messaging/messages/UserLeftVoice.java
- bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/UserListeningOnly.java 13 additions, 0 deletions...gbluebutton/api/messaging/messages/UserListeningOnly.java
- bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/UserSharedWebcam.java 13 additions, 0 deletions...igbluebutton/api/messaging/messages/UserSharedWebcam.java
- bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/UserUnsharedWebcam.java 13 additions, 0 deletions...bluebutton/api/messaging/messages/UserUnsharedWebcam.java
Loading
Please register or sign in to comment