-
- Downloads
Merge remote-tracking branch 'upstream/master' into presentation-upload
* upstream/master: (30 commits) User in not redirected automatically to the logoutURL. Fix errors in recording scripts. - fix issue where client cannot join using rtmpt Remove a few matterhorn references that were missed. Update the Gemfile.lock file to match gem changes Improve wave length guessing Remove a bunch of unused/old audio processing code. Drop streamio-ffmpeg from required gems Drop old/broken matterhorn script, and old video processing code. fix exception with cc localeCode vs. code - do not recycle http connection. Use a fresh one for each request to prevent exception when reusing old connection. - comment out record option for breakout rooms pending further testing. - change jws failed to start timeout from 60s to 90s. Sometimes it takes about 30s to download the libs especially for those far from the server or those with slow connection. - custom poll was sent to the wrong actor. Route it to the correct meeting actor. - propagate meeting metadata from parent to breakout room add a fourth help image for mac screenshare add property to closed caption transcript model for the locale code Added more explanation for Mac FireFox in screenshare-help.html - do not display the "Record" label. Hide breakout rooms checkbox. ...
Showing
- akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java 2 additions, 2 deletions...n/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
- akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/CaptionMessageReceiver.java 2 additions, 2 deletions...ebutton/core/pubsub/receivers/CaptionMessageReceiver.java
- akka-bbb-apps/src/main/java/org/bigbluebutton/core/recorders/events/EditCaptionHistoryRecordEvent.java 6 additions, 1 deletion.../core/recorders/events/EditCaptionHistoryRecordEvent.java
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 5 additions, 5 deletions...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala 1 addition, 0 deletions...src/main/scala/org/bigbluebutton/core/RecorderActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala 2 additions, 2 deletions...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala 3 additions, 3 deletions...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala 6 additions, 6 deletions...c/main/scala/org/bigbluebutton/core/apps/CaptionApp.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/CaptionModel.scala 15 additions, 7 deletions...main/scala/org/bigbluebutton/core/apps/CaptionModel.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/CaptionMessageToJsonConverter.scala 2 additions, 0 deletions...n/core/pubsub/senders/CaptionMessageToJsonConverter.scala
- bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java 1 addition, 0 deletions...ain/java/org/bigbluebutton/common/messages/Constants.java
- bbb-common-message/src/main/java/org/bigbluebutton/common/messages/EditCaptionHistoryMessage.java 7 additions, 2 deletions...bluebutton/common/messages/EditCaptionHistoryMessage.java
- bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendCaptionHistoryReplyMessage.java 1 addition, 1 deletion...utton/common/messages/SendCaptionHistoryReplyMessage.java
- bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UpdateCaptionOwnerMessage.java 7 additions, 2 deletions...bluebutton/common/messages/UpdateCaptionOwnerMessage.java
- bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java 1 addition, 1 deletion...src/main/java/org/bigbluebutton/common/messages/Util.java
- bbb-lti/grails-app/views/tool/index.gsp 0 additions, 1 deletionbbb-lti/grails-app/views/tool/index.gsp
- bbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar
- bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar
- bbb-screenshare/app/jws/lib/ffmpeg.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg.jar
- bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar
Loading
Please register or sign in to comment