Commit Graph

26752 Commits

Author SHA1 Message Date
Anton Georgiev
6852bcb5ec
Merge pull request #9115 from basisbit/patch-3
add support for upload of '.jpeg' files (not just '.jpg')
2020-04-16 17:18:53 -04:00
basisbit
f16772818d
add support for upload of '.jpeg' files (not just '.jpg')
apply previously merged PR #9025 into v2.2.x-release
2020-04-16 23:16:48 +02:00
Anton Georgiev
99e7a93fb1
Merge pull request #9066 from KDSBrowne/safari-ss-btn-show
Display screen share button in safari browser
2020-04-16 13:06:22 -04:00
KDSBrowne
814855ad4f update message string 2020-04-16 16:36:09 +00:00
Mitsutaka Sato
79361bd485 Set content-type for presentation download, to prevent vulnerable files from being executed 2020-04-16 11:39:49 +12:00
Anton Georgiev
eccc4dd377
Update settings.yml 2020-04-15 09:45:43 -04:00
ubahnverleih
92d3ee563f fixes shortcut help on mac browsers 2020-04-14 17:20:48 +02:00
KDSBrowne
1de9f2bfec show ss btn on safari (when selected display warning modal) 2020-04-13 15:31:16 +00:00
Fred Dixon
a3d5cbee1d
Update the BigBlueButton release to 2.2.5 2020-04-12 18:04:03 -04:00
Fred Dixon
69a3b1c947
Merge pull request #9045 from riadvice/fix-download
Fix presentation download by using the presentation id not its name
2020-04-12 14:33:42 -04:00
Ghazi Triki
535f2d665a Fix presentation download by using the presentation id not its name. 2020-04-12 18:09:33 +03:00
Ghazi Triki
5ebdf5ca77 Improve nginx matching on incoming URLs 2020-04-09 21:40:33 +03:00
Fred Dixon
14b0570859
Merge pull request #9017 from pedrobmarin/captions-xss-prevention
Remove dangerouslySetInnerHTML from captions
2020-04-08 19:32:24 -04:00
Pedro Beschorner Marin
3a6260f6f3 Remove dangerouslySetInnerHTML from captions 2020-04-08 11:17:52 -03:00
Calvin Walton
bfe8676df5 presentation: ignore text shapes with missing calcedFontSize
There's nothing reasonable we can do here if the font size is missing.
2020-04-06 12:46:57 -04:00
Ghazi Triki
78c649650e Strip HTML tags from name and fullName API params. 2020-04-03 20:00:33 +03:00
KDSBrowne
e46a2c7ccc fix chat dropdown not filling screen (mobile) 2020-04-02 15:23:45 +00:00
Anton Georgiev
f3bb50b3cc
Merge pull request #8954 from bigbluebutton/antobinary-bump-release
Bump up release to 2.2.4
2020-04-01 16:24:50 -04:00
Anton Georgiev
74767f036d
Update bigbluebutton-release 2020-04-01 16:23:58 -04:00
Anton Georgiev
79e8348eb9
Merge pull request #8952 from KDSBrowne/reduce-custom-poll-input
Fix maximum update depth exceeded in poll annotation
2020-04-01 15:03:10 -04:00
KDSBrowne
50bb820eb7 Fix poll Maximum update depth exceeded error 2020-04-01 18:29:27 +00:00
Richard Alam
5bd5c03fde
Merge pull request #8950 from kepstin/archive-clean-meta
Strip control characters from user-provided metadata in events file
2020-04-01 13:32:02 -04:00
Calvin Walton
20b150e86b Strip control characters from user-provided metadata in events file 2020-04-01 13:21:54 -04:00
Anton Georgiev
c69c891cf1
Merge pull request #8905 from antobinary/locales-march-27
Pulled HTML5 locales; Fixed Georgian issues
2020-03-27 18:16:28 -04:00
Anton Georgiev
3a1a23f91e Georgian (ka.json) causes loops and other issues. Use ka_GE.json
By keeping ka.json uncommittable I can refrain from adding edge case handlers
2020-03-27 18:06:00 -04:00
Anton Georgiev
0efc79f0aa Pulled HTML5 locales on March 27, 2020
Had to jump through hoops to add Georgian because Langmap does not have entry for 'ka' just for 'ka_GE'
2020-03-27 17:59:23 -04:00
Fred Dixon
f4957209b6
Merge pull request #8903 from ffdixon/bump-2.2.3
bump release
2020-03-27 17:43:15 -04:00
Fred Dixon
eccbda2fc0 bump release 2020-03-27 16:42:14 -05:00
Fred Dixon
1d512d547d
Merge pull request #8901 from kepstin/recording-archive-delete
Have the recording archive delete originals of archived media
2020-03-27 15:47:40 -04:00
Calvin Walton
a5a46b2c0a Have the recording archive delete originals of archived media
After the last segment of a recording has been archived, it is safe to
delete the original files that were recorded by the various media
handling components. This patch deletes the freeswitch audio files and
kurento webcam/screenshare files after they have been archived.

It needs to be used in combination with some changes to users/groups and
directory permissions to allow the `bigbluebutton` user to delete files
that it could previously only read.
2020-03-27 15:22:53 -04:00
Fred Dixon
9cfeffef50
Merge pull request #8896 from ffdixon/update-bigbluebutton-cron
Update to not use full paths
2020-03-27 10:00:56 -04:00
Fred Dixon
614312804c Update to not use full paths 2020-03-27 09:00:00 -05:00
Anton Georgiev
a04f6909b1
Merge pull request #8884 from KDSBrowne/fix-override-locale-loop-02
Fix render loop after changing locale with override setting
2020-03-26 10:54:02 -04:00
KDSBrowne
e15e45b149 fix render loop after changing locale when override setting is set 2020-03-26 13:32:15 +00:00
Anton Georgiev
2e73d844fd Pulled HTML5 locales, March 24, 2020 2020-03-25 16:18:19 -04:00
Anton Georgiev
1299abdf2c Revert "Merge pull request #8782 from ritzalam/generate-meeting-data"
This reverts commit 37ed2c7501, reversing
changes made to 5af41dabb4.
2020-03-25 16:13:01 -04:00
Anton Georgiev
97682d9162 Revert "Merge pull request #8759 from capilkey/2.2-join-fix"
This reverts commit 5af41dabb4, reversing
changes made to 004d872584.
2020-03-25 16:12:36 -04:00
Anton Georgiev
606ca5887a Revert "Merge pull request #8755 from KDSBrowne/fix-override-locale-loop"
This reverts commit 004d872584, reversing
changes made to ebdcf621b7.
2020-03-25 16:12:15 -04:00
Anton Georgiev
daaedc4f3e Revert "Merge pull request #8747 from riadvice/arabic-translation-update"
This reverts commit ebdcf621b7, reversing
changes made to 962f813d2f.
2020-03-25 16:11:51 -04:00
Fred Dixon
37ed2c7501
Merge pull request #8782 from ritzalam/generate-meeting-data
Generate meeting data
2020-03-14 16:26:06 -04:00
Richard Alam
da5bbe210e - fix var name 2020-03-14 12:04:42 -07:00
Richard Alam
7a0796679b Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into generate-meeting-data 2020-03-14 11:55:27 -07:00
Richard Alam
3cddd8a1c5 - dump out some meeting stats data into the log 2020-03-14 11:54:45 -07:00
Anton Georgiev
5af41dabb4
Merge pull request #8759 from capilkey/2.2-join-fix
Only join a user if the connection is still active
2020-03-11 16:59:11 -04:00
Anton Georgiev
004d872584
Merge pull request #8755 from KDSBrowne/fix-override-locale-loop
Fix render loop after changing locale with override setting
2020-03-11 16:53:16 -04:00
Chad Pilkey
e9a73217da only join a user if the connection is still active 2020-03-11 13:40:50 -07:00
KDSBrowne
af14345185 fix render loop after changing locale when override setting is set 2020-03-11 13:55:41 +00:00
Anton Georgiev
ebdcf621b7
Merge pull request #8747 from riadvice/arabic-translation-update
Update Arabic translations for 2.2 release
2020-03-10 11:32:40 -04:00
Ghazi Triki
32adce7134 Update Arabic translations to cover 100% 2020-03-10 08:17:59 +03:00
Fred Dixon
962f813d2f
Merge pull request #8735 from ffdixon/bump-2.2.2
Bump 2.2.2 -- fixed kurento symbolic link /var/kurento ->  /var/lib/kurento
2020-03-08 20:40:17 -04:00