-
- Downloads
Merge branch 'master' into accessibility-improve
# Conflicts: # bigbluebutton-client/locale/en_US/bbbResources.properties # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PresentationApp.scala 7 additions, 2 deletions...n/scala/org/bigbluebutton/core/apps/PresentationApp.scala
- bbb-api-demo/src/main/webapp/js/demo4.js 3 additions, 2 deletionsbbb-api-demo/src/main/webapp/js/demo4.js
- bbb-screenshare/NOTES.md 184 additions, 181 deletionsbbb-screenshare/NOTES.md
- bbb-screenshare/README.md 176 additions, 0 deletionsbbb-screenshare/README.md
- bbb-screenshare/app/jws/lib/ffmpeg-svc2.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg-svc2.jar
- bbb-screenshare/app/jws/lib/javacpp.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/javacpp.jar
- bbb-screenshare/app/jws/lib/javacv.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/javacv.jar
- bbb-screenshare/jws/README.md 0 additions, 1 deletionbbb-screenshare/jws/README.md
- bbb-screenshare/jws/native-libs/unsigned-jars/README.md 8 additions, 4 deletionsbbb-screenshare/jws/native-libs/unsigned-jars/README.md
- bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-3.0.2-1.2-svc2.jar 0 additions, 0 deletions...e/jws/native-libs/unsigned-jars/ffmpeg-3.0.2-1.2-svc2.jar
- bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg-svc2.sh 0 additions, 16 deletions...enshare/jws/native-libs/unsigned-jars/sign-ffmpeg-svc2.sh
- bbb-screenshare/jws/webstart/build.sh 1 addition, 3 deletionsbbb-screenshare/jws/webstart/build.sh
- bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java 41 additions, 31 deletions...in/java/org/bigbluebutton/app/video/VideoApplication.java
- bbb-video/src/main/webapp/WEB-INF/red5-web.xml 0 additions, 1 deletionbbb-video/src/main/webapp/WEB-INF/red5-web.xml
- bigbluebutton-client/locale/en_US/bbbResources.properties 3 additions, 2 deletionsbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/src/org/bigbluebutton/common/AccessibleNumericStepper.as 33 additions, 0 deletions.../src/org/bigbluebutton/common/AccessibleNumericStepper.as
- bigbluebutton-client/src/org/bigbluebutton/core/BBB.as 0 additions, 1 deletionbigbluebutton-client/src/org/bigbluebutton/core/BBB.as
- bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager.as 0 additions, 29 deletions...ient/src/org/bigbluebutton/core/managers/ConfigManager.as
- bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as 0 additions, 1 deletion...ent/src/org/bigbluebutton/core/managers/ConfigManager2.as
Loading
Please register or sign in to comment