Commit Graph

26217 Commits

Author SHA1 Message Date
Richard Alam
f8437fb19d Merge branch 'v2.2.x-release' of https://github.com/bigbluebutton/bigbluebutton into pres-url-on-page-convert 2020-03-01 05:38:04 -08:00
Richard Alam
035beb9f9b
Merge pull request #8677 from riadvice/cve-fixes
Updated java projects dependencies versions for 2.2
2020-03-01 08:32:21 -05:00
Fred Dixon
698320e955
Merge pull request #8686 from bigbluebutton/bump-nokogiri
Bump nokogiri
2020-02-29 17:06:15 -05:00
Fred Dixon
abc4998d2c
Update bigbluebutton-release
Bump to rc-7
2020-02-29 10:42:10 -05:00
Fred Dixon
8777c2c9dc Bump dependency for nokogiri version 2020-02-29 08:56:33 -06:00
Fred Dixon
ff5b1b2149
Merge pull request #8683 from capilkey/web-audio-api-fallback
Implement WebAudio fallback
2020-02-29 09:16:27 -05:00
Chad Pilkey
163026ebff
Merge pull request #8680 from antobinary/remove-history-package
Remove unused package "history"
2020-02-28 19:46:40 -05:00
Chad Pilkey
ecfbe5e506 implmenent sip.js fallback for playing audio with web audio api 2020-02-29 00:38:30 +00:00
Richard Alam
a1ea899c35 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into pres-url-on-page-convert 2020-02-28 14:27:34 -08:00
Richard Alam
cd62e7f64c
Merge pull request #8682 from KDSBrowne/2.2-add-upload-err-msg
add conversion error messages / remove unused message
2020-02-28 17:26:01 -05:00
KDSBrowne
ad808fb970 add conversion error messages / remove unused message 2020-02-28 21:57:05 +00:00
Richard Alam
c0372e3a97 Merge branch 'blank-presentation' of https://github.com/riadvice/bigbluebutton into riadvice-blank-presentation 2020-02-28 13:32:02 -08:00
Richard Alam
d879710503 - minimize logs 2020-02-28 13:12:53 -08:00
Anton Georgiev
96e8f59a7b
Merge pull request #8681 from antobinary/locales-rc7
Pulled HTML5 locales on Feb 28, 2020
2020-02-28 14:31:52 -05:00
Anton Georgiev
12cb174662 Pulled HTML5 locales on Feb 28, 2020 2020-02-28 14:28:03 -05:00
Anton Georgiev
f356a530e9 remove unused package "history" 2020-02-28 14:23:09 -05:00
Anton Georgiev
addc5f2ea8
Merge pull request #8647 from pedrobmarin/user-list-text-overflow
Fix user-list item text-overflow
2020-02-28 11:05:14 -05:00
Anton Georgiev
99d31e9d5f
Merge pull request #8648 from capilkey/2.2-new-audio-state
Use internal messages for call state instead of DTMF
2020-02-28 11:04:03 -05:00
Ghazi Triki
64d08d69c7 Updated java projects dependencies versions. 2020-02-28 10:44:28 +01:00
Richard Alam
da0cba1701 Merge branch 'v2.2.x-release' of https://github.com/bigbluebutton/bigbluebutton into pres-url-on-page-convert 2020-02-27 14:16:21 -08:00
Richard Alam
dc6dc6b6d4
Merge pull request #8675 from bigbluebutton/ritzalam-turn-off-png-gen
Turn off png generation
2020-02-27 16:58:18 -05:00
Richard Alam
e2a4bf3bb2
Turn off png generation
Turn off png generation as we don't use it.
2020-02-27 16:57:13 -05:00
Richard Alam
eb48875f7e - remove unused file 2020-02-27 13:40:57 -08:00
Richard Alam
859c6a2220 - clean up
- addjust timeouts
2020-02-27 13:37:42 -08:00
Richard Alam
3a5b990e4a - turn off png generation
- setup number of processing threads
2020-02-27 13:30:55 -08:00
Anton Georgiev
4f99a6a1ab
Merge pull request #8673 from KDSBrowne/issue-8668-2.2
Move kick user option to bottom of options list
2020-02-27 11:59:26 -05:00
KDSBrowne
4e045283f4 move remove user option to bottom of dropdown menu 2020-02-27 15:17:24 +00:00
Richard Alam
518fb12341 - send end completion for image presentation 2020-02-26 14:46:58 -08:00
Richard Alam
5428e86448 - try to process multiple presentations in parallel 2020-02-26 14:36:04 -08:00
Chad Pilkey
584c115472
Merge pull request #8669 from antobinary/remove-some-atmosphere-packages
Explicitly import lodash where it is used
2020-02-26 14:58:52 -05:00
Anton Georgiev
36a7536ca0 bump up node-sass to 4.13.1 as part of npm audit 2020-02-26 14:57:55 -05:00
Anton Georgiev
f1fc72bc01 explicitly import lodash where it is used 2020-02-26 14:48:40 -05:00
Chad Pilkey
1912244de2
Merge pull request #8667 from antobinary/remove-some-atmosphere-packages
Remove some atmosphere packages
2020-02-26 12:47:50 -05:00
Richard Alam
70b93bdcc8 - cleanup 2020-02-26 08:13:03 -08:00
Anton Georgiev
dbc997cc85 explicitly import lodash so we can use _ functions 2020-02-26 10:43:24 -05:00
Anton Georgiev
ecc02915d6 remove meteor package jquery and lodash 2020-02-26 10:24:38 -05:00
Richard Alam
fb222e0a7f - include page extraction into conversion step 2020-02-25 14:58:34 -08:00
Richard Alam
f4a4b8be5d - downscale large pdf page 2020-02-25 14:18:56 -08:00
Richard Alam
bba17c3a03 - handle pages on page converted messages instead on conversion completed message 2020-02-24 15:00:20 -08:00
Anton Georgiev
e6f24fe874
Merge pull request #8650 from KDSBrowne/2.2-shortcut-fix
Fix broken shortcut keys
2020-02-24 16:54:38 -05:00
Fred Dixon
e7b789d12d
Merge pull request #8664 from ffdixon/fix-link-bbb-conf
Fix broken link
2020-02-24 13:34:58 -05:00
Fred Dixon
0762f04fd7 Fix broken link 2020-02-24 12:34:05 -06:00
Richard Alam
f521f97382 - explode pdf so we can process each page 2020-02-22 09:33:32 -08:00
Ghazi Triki
0c96050fde Improvements to conversion default fall-back files and process. 2020-02-22 18:26:50 +01:00
Richard Alam
ddb8f53852 - run conversion in a completion service 2020-02-21 12:57:40 -08:00
Richard Alam
0c9c9878c8 - figure out filename when converting one pdf page to png 2020-02-20 15:12:32 -08:00
Richard Alam
3864fef3ea - generate proper png and thumb filenames 2020-02-20 13:42:37 -08:00
Richard Alam
2fbd2821f4 - fix to display slodes 2020-02-20 12:43:23 -08:00
Richard Alam
7099df132d - handle new messages in akka apps 2020-02-19 15:04:19 -08:00
Richard Alam
96cdf30af7 - do proper page conversion steps 2020-02-19 12:29:01 -08:00