Commit Graph

26710 Commits

Author SHA1 Message Date
Anton Georgiev
f83168de3d
Merge pull request #10152 from antobinary/locales-2020-07-29
Allow img tag in welcome and modOnly messages
2020-07-29 15:32:51 -04:00
Anton Georgiev
2c32608cd5 allow for img tag in welcome and modOnly messages 2020-07-29 15:09:15 -04:00
Anton Georgiev
b9902eceac
Merge pull request #10148 from pedrobmarin/full-audio-socket-check
Add a minimum socket validation to full-audio connection
2020-07-29 13:13:30 -04:00
Pedro Beschorner Marin
19e301e28e Add a minimum socket validation to full-audio connection 2020-07-29 13:10:17 -03:00
Anton Georgiev
49cec4ca16
Merge pull request #10146 from antobinary/sanitize
Sanitized modOnlyMessage prior to using it
2020-07-29 11:58:13 -04:00
Anton Georgiev
81e40ef018
Merge pull request #10147 from antobinary/locales-2020-07-29
Pulled HTML5 locales on July 29, 2020
2020-07-29 11:57:53 -04:00
Anton Georgiev
45c2368a3c Pulled HTML5 locales on July 29, 2020 2020-07-29 11:54:21 -04:00
Anton Georgiev
1ea72ccb95 sanitize modOnlyMessage in html5 client 2020-07-29 11:31:00 -04:00
Fred Dixon
135bf919be
Update bigbluebutton-release 2020-07-27 21:23:27 -04:00
Anton Georgiev
4456a4db1f move sanitazing of welcome message to backend 2020-07-27 16:33:10 -04:00
Anton Georgiev
ff2357d6bb
Merge pull request #10128 from vitormateusalmeida/sanitize-data-v2.2
Sanitize data v2.2 - Add tag br in whitelist
2020-07-27 15:49:24 -04:00
Vitor Mateus De Almeida
be3bfd620a Merge remote-tracking branch 'upstream/v2.2.x-release' into sanitize-data-v2.2 2020-07-27 16:13:20 -03:00
Vitor Mateus De Almeida
3ef0771d58 Add tag br in whitelist 2020-07-27 16:12:31 -03:00
Anton Georgiev
321942e2ed
Merge pull request #10089 from vitormateusalmeida/sanitize-data-v2.2
Sanitize data in addUser
2020-07-23 10:23:35 -04:00
Fred Dixon
4a6de4527b
Create SECURITY.md 2020-07-22 20:32:24 -04:00
Fred Dixon
71fca60ee6
Merge pull request #10071 from riadvice/bbb-conf-nginx-logs
Collect more bigbluebutton nginx access logs in bbb-conf --zip
2020-07-21 17:16:41 -04:00
Anton Georgiev
00cb4867e8
Merge pull request #10103 from antobinary/update-lodash
Update lodash and node-sass versions
2020-07-21 17:04:34 -04:00
Anton Georgiev
a0f74f0e52 update lodash and node-sass versions 2020-07-21 17:00:31 -04:00
Fred Dixon
eb1624ac7d
Merge pull request #10099 from KDSBrowne/screenshare-crop-fix
Prevent screen share cropping on chrome 84
2020-07-20 22:21:57 -04:00
KDSBrowne
f45af628d6 fix screen share cropping on chrome 2020-07-19 21:53:59 +00:00
Vitor Mateus De Almeida
da570ca002 Sanitize data in message 2020-07-17 15:36:30 -03:00
Vitor Mateus De Almeida
6cb28a6574 Sanitize data in addUser 2020-07-17 12:08:02 -03:00
Richard Alam
8ba5ef479c
Merge pull request #10054 from pedrobmarin/thumbnail-name
Avoid wrongly naming a thumbnail as thumb-1
2020-07-15 23:33:15 -04:00
Ghazi Triki
b4c80b8572 Collect more bigbluebutton nginx access logs in bbb-conf --zip 2020-07-15 09:31:45 +01:00
Anton Georgiev
2ef2c63b4f
Merge pull request #10067 from jfsiebel/clear-pvt-messages-meeting-end
Clear private messages on meeting end
2020-07-14 15:54:02 -04:00
Joao Siebel
ee3d6a0a1d Clear private messages on meeting end 2020-07-14 16:51:06 -03:00
Pedro Beschorner Marin
49236ac3d0 Avoid wrongly naming a thumbnail as thumb-1 2020-07-13 19:58:02 -03:00
Anton Georgiev
1ea076a940
Merge pull request #10024 from antobinary/breakouts-url
Ensure getURL value for breakout before redirecting
2020-07-10 13:59:23 -04:00
Anton Georgiev
0b5d5fcc0f
Merge pull request #10032 from antobinary/locales-2020-07-10
Adjust check for User.loggedOut to prevent errors
2020-07-10 13:49:57 -04:00
Anton Georgiev
c763041285 Adjust check for User.loggedOut to prevent errors 2020-07-10 13:45:37 -04:00
Anton Georgiev
f6acb2cb60 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into locales-2020-07-10 2020-07-10 13:23:48 -04:00
Anton Georgiev
58efe0413f
Bump up release version to 2.2.20 2020-07-10 12:57:12 -04:00
Anton Georgiev
ebb80f3285
Merge pull request #9792 from symptog/v2.2.x-release
Fix missing leading zeros in conference number for 2.2.x
2020-07-10 11:31:32 -04:00
Anton Georgiev
b20043a363
Merge pull request #9728 from jfsiebel/custom-parameters-breakout-rooms
Use main room user parameters in breakouts room
2020-07-10 11:28:04 -04:00
Anton Georgiev
9f5158a525 Merge branch 'custom-parameters-breakout-rooms' of github.com:jfsiebel/bigbluebutton into locales-2020-07-10 2020-07-10 11:21:53 -04:00
Anton Georgiev
5159607f73
Merge pull request #10030 from antobinary/locales-2020-07-10
Pulled HTML5 locales July 10, 2020
2020-07-10 11:21:14 -04:00
Anton Georgiev
0adaff23b4 Pulled HTML5 locales July 10, 2020 2020-07-10 11:19:42 -04:00
Anton Georgiev
bc55bc0d41 ensure getURL value for breakout before redirecting 2020-07-09 16:53:42 -04:00
Anton Georgiev
fad56de143
Merge pull request #9966 from lfzawacki/v2.2.x-release
Implement a simple Panopto external video player
2020-07-09 16:26:25 -04:00
Anton Georgiev
9c7b86391e
Merge pull request #10021 from prlanzarin/upstream-2.2-conf-mtm
Make some media connection timeouts configurable
2020-07-09 16:18:49 -04:00
prlanzarin
1dbafffa26 audio: make listen only call timeout configurable 2020-07-09 18:02:18 +00:00
prlanzarin
0f8b27d2d8 video-provider: make camera timeouts configurable
Also add missing settings.yml val for wsConnectionTimeout
2020-07-09 17:53:24 +00:00
prlanzarin
72a67bdd63 video-provider: make reconn websocket connectionTimeout configurable
Keep the default value (current) in settings.yml
2020-07-09 17:50:04 +00:00
Fred Dixon
a6eda3da91
Merge pull request #9924 from prlanzarin/upstream-2.2-webhooks-timeout
bbb-webhooks: add a timeout configuration to be used on POST requests
2020-07-05 16:01:19 -04:00
Fred Dixon
1da679a9ad
Merge pull request #9923 from kepstin/rec-fixes
Recording bugfixes for presentation format
2020-07-05 16:00:42 -04:00
Lucas Zawacki
65892677ee Make file video player work on every browser 2020-06-30 17:41:44 -03:00
Lucas Zawacki
4158372ac7 Use panoto mp4 url to implement a version of external-video 2020-06-30 17:41:42 -03:00
Anton Georgiev
a2142c9006
Merge pull request #9963 from antobinary/add-url-to-logs
Added clientURL to client logs
2020-06-30 15:59:39 -04:00
Anton Georgiev
0a399af81f add clientURL to logs from client 2020-06-30 15:18:01 -04:00
Fred Dixon
175a23e5ad
Merge pull request #9962 from ffdixon/update-bbb-conf-1
Ensure ESL password is updated
2020-06-30 13:19:21 -04:00