BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,918 Commits 13 Branches 260 Tags 1.1 GiB
e3dee6d7a2
Commit Graph

24918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
e3dee6d7a2 - turn on svg generation by default while swf is turned off by default 2019-06-07 13:37:24 -07:00
Richard Alam
9ac272d1a0 - use thumbnails to find the num pages of presentation instead of swfs as we now turn off generation of 
swfs for html5
 2019-06-07 13:22:59 -07:00
Richard Alam
19caf3a386 Merge branch 'fix-recording-swf-disabled' of https://github.com/riadvice/bigbluebutton into riadvice-fix-recording-swf-disabled 2019-06-07 09:14:11 -07:00
Richard Alam
50d8f016e3
Merge pull request #7584 from bigbluebutton/captions-text-tracks-intermediate-branch 
Support uploading text track for recording
 2019-06-06 18:21:32 -04:00
Richard Alam
6e7ece7a9f - minor cleanup 2019-06-06 15:16:43 -07:00
Richard Alam
a46d0b9680 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into captions-text-tracks-intermediate-branch 2019-06-06 15:04:53 -07:00
Richard Alam
5d9f72ae21 - add single use token to request for the text track 2019-06-06 14:54:31 -07:00
Richard Alam
7659e7fc0e - store single use auth keys in redis 2019-06-06 14:26:28 -07:00
Richard Alam
b3de5ae440 Merge branch 'captions-text-tracks-intermediate-branch' of github.com:bigbluebutton/bigbluebutton into captions-text-tracks-intermediate-branch 2019-06-06 10:04:52 -07:00
Richard Alam
a8b6717c94 - put captions into temporary file to remove race condition between start of processing and writing contents of file. 2019-06-06 10:03:54 -07:00
Fred Dixon
40d87e8019
Merge pull request #7576 from kepstin/shared-note-repose 
RaP: Fix error message when shared notes could not be archived.
 2019-06-06 11:36:58 -04:00
Calvin Walton
19a011cc29 RaP: Fix error message when shared notes could not be archived. 
It used to print:

Failed to download file: undefined local variable or method `respose' for BigBlueButton:Module
Did you mean?  response

because the incorrect variable name was used in the error message.

There was no effect other than the message in the log, since the shared notes
couldn't be archived anyways, and the only thing the exception did was ...
prevent the shared notes from being archived.
 2019-06-06 10:55:53 -04:00
Calvin Walton
4c1e2ed477 RaP: Reduce ffmpeg output spam in logs of caption inbox 2019-06-06 10:49:27 -04:00
Calvin Walton
7f92b58140 RaP: Dir.glob accepts a block directly, no need for a temp variable 2019-06-06 10:44:47 -04:00
Calvin Walton
620ed367be RaP: glob is a method on Dir, not File 2019-06-06 10:43:40 -04:00
Calvin Walton
94ae7c330b RaP: Use correct variable to get info for new caption track 2019-06-06 10:41:14 -04:00
Calvin Walton
aecb66e28d RaP: Create the recording captions dir before moving the converted vtt file 2019-06-06 10:34:08 -04:00
Richard Alam
7577bf5310 - check if lang param is valid 2019-06-06 07:21:54 -07:00
Anton Georgiev
8946951f08
Merge pull request #7575 from capilkey/improve-kurento-lo-errors 
Try to improve Kurento listen-only error reporting
 2019-06-05 15:00:43 -04:00
Chad Pilkey
42f18a15fe try to improve kurento listen-only error reporting 2019-06-05 10:50:21 -07:00
Anton Georgiev
7b59f1d309
Merge pull request #7574 from MaximKhlobystov/guest-management-checkbox 
Align the checkbox and the label (guest management)
 2019-06-05 11:40:59 -04:00
Maxim Khlobystov
6ba31224ff Align the checkbox and the label 2019-06-05 11:30:10 -04:00
Anton Georgiev
32df282400
Merge pull request #7571 from MaximKhlobystov/prop-types-warning 
Fix the warning that appears when user enters as guest
 2019-06-05 11:01:34 -04:00
Maxim Khlobystov
ac844031bf Fix prop-types warning in Base 2019-06-04 15:23:44 -04:00
Calvin Walton
07688593ac caption-inbox: clean up track file if language tag is invalid 2019-06-04 14:28:58 -04:00
Anton Georgiev
90b84d7e16
Merge pull request #7569 from capilkey/bump-audio-leave-level 
Bump audio leave log level
 2019-06-04 14:19:31 -04:00
Chad Pilkey
854aa8019b bump audio leave log level 2019-06-04 11:16:43 -07:00
Richard Alam
c92bfbb591 - deploy recording scripts in proper location 
- log upload captions params
 2019-06-04 14:07:10 -04:00
Calvin Walton
f693915e99 RaP captions: Fix usage of JSON.parse, use a proc to capture local vars 2019-06-04 14:01:51 -04:00
Anton Georgiev
66d35a940d
Merge pull request #7568 from antobinary/callback-broken 
Pass callback for closing of permissions-overlay
 2019-06-04 13:56:07 -04:00
Anton Georgiev
b67908ce79 pass callback for closing of permissions-overlay 2019-06-04 17:43:58 +00:00
Calvin Walton
f04bf290af Fix requires for journald-logger 2019-06-04 12:18:46 -04:00
Calvin Walton
413f2cd2fc RaP: Correct comment about ruby version in rubocop config 2019-06-04 11:25:20 -04:00
Anton Georgiev
2c85ff6c65
Merge pull request #7540 from MaximKhlobystov/webdriverio-tests 
WebdriverIO Tests
 2019-06-04 11:10:24 -04:00
Maxim Khlobystov
1eafbf04f8 WebdriverIO tests. 2019-06-04 11:05:27 -04:00
Calvin Walton
983751c9c0 RaP: Have the caption inbox run the caption integration scripts. 2019-06-04 11:03:22 -04:00
Calvin Walton
bdd60a197c RaP: Add note about rubocop ruby version 2019-06-04 11:03:22 -04:00
Calvin Walton
676fa41f06 Add caption integration script for presentation format. 2019-06-04 11:03:22 -04:00
Calvin Walton
b22c905194 rap-caption-inbox: improve formatting, initial pass at conversion 
It now attempts to convert the uploaded caption file to WebVTT and
updates the index file.
 2019-06-04 11:03:22 -04:00
Calvin Walton
775c348ddc RaP: Add an optional test group which installs e.g. rubocop 2019-06-04 11:03:22 -04:00
Calvin Walton
c6e09f52a1 RaP Caption inbox: read uploaded caption json file 
Some additional validation/normalization is added for the language tag,
and some cleanup has been done for logging.
 2019-06-04 11:03:22 -04:00
Calvin Walton
812052a8c7 Change events archiver to read config from relative path 
Makes testing easier
 2019-06-04 11:03:22 -04:00
Calvin Walton
d74f0044cc Add function that uses ffmpeg to convert subtitles to webvtt 
FFmpeg has pretty good format autodetection even if the filename has the
'.txt' extension, so just rely on that. It'll even pull subtitles out of
video files - although I expect we'll have size limits so that doesn't
happen.
 2019-06-04 11:03:22 -04:00
Calvin Walton
23da507fa8 Initial outline of the rap worker tool for handling the caption inbox 
Rather than running the tool in a loop, I'm using inotify to watch for
new files being created (ideally, the other rap workers will be migrated
to this style in the future). The trigger for processing is the creation
of the .json index file for the uploaded track.
 2019-06-04 11:03:22 -04:00
Anton Georgiev
d3d3cad20a
Merge pull request #7544 from Tainan404/issue-7520 
Add meteor check for annotations to avoid malformed message.
 2019-06-04 09:40:35 -04:00
Anton Georgiev
a40a697f78
Merge pull request #7563 from vitormateusalmeida/issue-7562 
Fix overflow of webcams-draggable
 2019-06-04 07:51:32 -04:00
Richard Alam
7fdb920aad - change field names to match json keys 2019-06-03 13:18:27 -07:00
Vitor Mateus
6896cc08b4 Fix overflow of webcams-draggable #7562 2019-06-03 17:03:59 -03:00
Richard Alam
8db3903942 - add checksum check on put recordings text track api 2019-06-03 12:59:37 -07:00
Anton Georgiev
7b851cbee7
Merge pull request #7559 from capilkey/strip-mdns-candidates 
Strip mDNS candidates from sip.js SDPs
 2019-06-03 15:52:18 -04:00