-
- Downloads
Merge branch 'master' into format-logging-when-user-joins-global-audio
Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
Showing
- bbb-api-demo/src/main/webapp/demo12.jsp 4 additions, 4 deletionsbbb-api-demo/src/main/webapp/demo12.jsp
- bbb-client-check/locale/en_US/resources.properties 2 additions, 0 deletionsbbb-client-check/locale/en_US/resources.properties
- bbb-client-check/resources/config.xml.template 2 additions, 0 deletionsbbb-client-check/resources/config.xml.template
- bbb-client-check/resources/lib/api-bridge.js 6 additions, 2 deletionsbbb-client-check/resources/lib/api-bridge.js
- bbb-client-check/src/org/bigbluebutton/clientcheck/model/IXMLConfig.as 2 additions, 0 deletions...eck/src/org/bigbluebutton/clientcheck/model/IXMLConfig.as
- bbb-client-check/src/org/bigbluebutton/clientcheck/model/XMLConfig.as 31 additions, 19 deletions...heck/src/org/bigbluebutton/clientcheck/model/XMLConfig.as
- bbb-client-check/src/org/bigbluebutton/clientcheck/model/test/BrowserTest.as 27 additions, 0 deletions...c/org/bigbluebutton/clientcheck/model/test/BrowserTest.as
- bbb-client-check/src/org/bigbluebutton/clientcheck/service/ExternalApiCallbacks.as 28 additions, 2 deletions...bigbluebutton/clientcheck/service/ExternalApiCallbacks.as
- bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MainViewMediator.as 8 additions, 1 deletion...gbluebutton/clientcheck/view/mainview/MainViewMediator.as
- bbb-video/build.gradle 9 additions, 8 deletionsbbb-video/build.gradle
- bbb-video/src/main/resources/logback-video.xml 2 additions, 2 deletionsbbb-video/src/main/resources/logback-video.xml
- bbb-voice/build.gradle 13 additions, 12 deletionsbbb-voice/build.gradle
- bbb-voice/src/main/resources/logback-sip.xml 2 additions, 2 deletionsbbb-voice/src/main/resources/logback-sip.xml
- bigbluebutton-apps/build.gradle 10 additions, 9 deletionsbigbluebutton-apps/build.gradle
- bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java 2 additions, 2 deletions...rg/bigbluebutton/conference/BigBlueButtonApplication.java
- bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java 5 additions, 4 deletions...erence/meeting/messaging/redis/MeetingMessageHandler.java
- bigbluebutton-apps/src/main/resources/logback-bigbluebutton.xml 2 additions, 2 deletions...ebutton-apps/src/main/resources/logback-bigbluebutton.xml
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 9 additions, 8 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/CollectorActor.scala 1 addition, 1 deletion...rc/main/scala/org/bigbluebutton/core/CollectorActor.scala
Loading
Please register or sign in to comment