Commit Graph

26503 Commits

Author SHA1 Message Date
Richard Alam
db26d517a0
Merge pull request #9259 from riadvice/fix-file-download
Return 404 error when the file download is not allowed.
2020-04-25 12:56:31 -04:00
Ghazi Triki
b21ca8355a Return 404 error when the file download is not allowed. 2020-04-25 19:51:17 +03:00
Richard Alam
ddb1b19887
Merge pull request #9245 from ritzalam/make-bbb-web-localhost
Bind to localhost
2020-04-24 18:07:46 -04:00
Richard Alam
e805e7a3d2 Bind to localhost
Made a mistake of defining param twice
2020-04-24 15:05:17 -07:00
Richard Alam
7be4718b7f
Merge pull request #9244 from ritzalam/make-bbb-web-localhost
Bind to localhost
2020-04-24 17:30:58 -04:00
Richard Alam
b30a8093d1 Bind to localhost
Make bbb-web bind to localhost
2020-04-24 14:29:36 -07:00
Richard Alam
a63f7df4bb
Merge pull request #9241 from ritzalam/increase-length-of-voice-conf
Increase voice conf length
2020-04-24 12:40:48 -04:00
Richard Alam
ac78fd5913 - revert back value for wsUrl 2020-04-24 09:39:21 -07:00
Richard Alam
e968780e53 - comment out printlns 2020-04-24 09:37:25 -07:00
Richard Alam
79096d0c55 Increase voice conf length
We need to increase the length of the voice conference. If we have lots of meetings running,
 there is a high chance of collision.

 Need corresponding changes to FreeSWITCH dialplan.

 In bbb_echo_test.xml, change to `expression="^echo(\d{5,11})$"`.

 In bbb_conference.xml, change to `expression="^(\d{5,11})$"`.
2020-04-24 09:22:46 -07:00
Richard Alam
d678b2a8cf
Merge pull request #9236 from ritzalam/do-not-ban-when-ejecting-self
Do not ban users ejecting self from meeting
2020-04-24 10:22:15 -04:00
Richard Alam
309ac30899 - comment out debug printlns 2020-04-24 07:20:42 -07:00
Richard Alam
58fed45754 Do not ban users ejecting self from meeting
Some users join with multiple browsers. When user is ejecting self from one browser,
 do not eject all sessions for that user and do not prevent them from rejoining.
2020-04-24 07:14:50 -07:00
Richard Alam
43d9c3da98
Merge pull request #9230 from ritzalam/track-ejected-dialin-users
Keep track of banned dial-in callers
2020-04-24 09:44:53 -04:00
Richard Alam
cca49e4546 Keep track of banned dial-in callers
When a dial-in caller is ejected from the meeting, keep track of the callerid number.
 When the same callerid number rejoins the conference, eject the caller.
2020-04-23 19:12:16 -07:00
Anton Georgiev
b4f5d00f29
Merge pull request #9218 from antobinary/2020-04-23-locales
Pulled HTML5 locales April 23, 2020; Added Norwegian
2020-04-23 10:22:48 -04:00
Anton Georgiev
89fb118d00 Pulled HTML5 locales April 23, 2020; Added Norwegian 2020-04-23 10:17:43 -04:00
Richard Alam
a6185e359c
Merge pull request #9188 from ritzalam/track-ejected-user
Prevent ejected users from rejoining
2020-04-22 09:19:56 -04:00
Mitsutaka Sato
b256b55c3e Fix calcGuestStatus 2020-04-22 15:10:42 +12:00
Richard Alam
c40f1727d3 Prevent ejected users from rejoining
- track ejected user based on external userid. If user rejoins with the same external
   userid, fail the validate token.
2020-04-21 19:26:09 -07:00
Fred Dixon
f6f4f8321b
Merge pull request #9102 from miztaka/catalyst-fix-pentest-download
Set content-type for presentation download
2020-04-18 17:47:47 -04:00
Anton Georgiev
0b0e32341a
Update BigBlueButton version to 2.2.6 2020-04-17 09:08:12 -04:00
Anton Georgiev
3924030552
Merge pull request #9125 from antobinary/2020-04-17
Update HTML5 npm packages
2020-04-17 08:22:31 -04:00
Anton Georgiev
6dff76d68d
Merge pull request #9126 from antobinary/2020-04-17-locales
Pulled HTML5 locales April 17, 2020
2020-04-17 08:20:31 -04:00
Anton Georgiev
b1cfef4c1b Pulled HTML5 locales April 17, 2020 2020-04-17 08:02:41 -04:00
Anton Georgiev
6378112839 update npm packages 2020-04-17 07:34:20 -04:00
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
Ghazi Triki
78c649650e Strip HTML tags from name and fullName API params. 2020-04-03 20:00:33 +03: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