Commit Graph

27548 Commits

Author SHA1 Message Date
Anton Georgiev
080e523bd5
Merge pull request #10193 from stweil/lgtm
Fix regular expression in Arc Player (LGTM)
2020-08-04 14:43:41 -04:00
KDSBrowne
e399fe92ba update filenames for saved public chat / users list 2020-08-04 13:27:32 +00:00
KDSBrowne
4ef489795c Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-9861 2020-08-04 12:59:30 +00:00
Stefan Weil
1d3d31107e Fix regular expression in Arc Player (LGTM)
LGTM report:

    The escape sequence '\.' is equivalent to just '.', so the sequence may
    still represent a meta-character when it is used in a regular expression.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-08-04 08:28:36 +02:00
KDSBrowne
9dcd3b3f61 remove const function and move into export 2020-08-03 21:35:12 +00:00
Joao Siebel
6987ab988c Restore activity check modal.
If activity check was enabled in server, the activity check modal wasn't showed
to users and after a given time the user was disconnect, also fix the meeting-end
and error-screen messages, informing the user the reason why he was kicked.
2020-08-03 09:44:21 -03:00
Fred Dixon
0041eac050
Merge pull request #10185 from tdjac0bs/bbb_web_improvements
Make the bigbluebutton user id be mapped on startup
2020-08-02 20:27:40 -04:00
Tiago Jacobs
29ff2504ff Make the bigbluebutton user id be mapped on startup ( and no more during build time ) 2020-08-02 20:05:11 -03:00
Anton Georgiev
3da55d98c5
Bumped up version to 2.2.22 2020-07-31 19:19:29 -04:00
Anton Georgiev
6fe9990c1e
Merge pull request #10172 from KDSBrowne/2.2-fix-sr-poll-access
Add aria-label to whiteboard poll result
2020-07-31 15:20:19 -04:00
Anton Georgiev
82313bf9dc
Merge pull request #10171 from KDSBrowne/2.2-fix-svg-exception
Prevent negative values being used in presentation height / width
2020-07-31 15:16:09 -04:00
KDSBrowne
bd5b010695 add message 2020-07-31 14:37:13 +00:00
KDSBrowne
7f7e24bfb4 prevent negative values being supplied to svg height / width 2020-07-31 14:19:28 +00:00
KDSBrowne
f409e912b1 add aria-label to whiteboard poll result 2020-07-31 13:20:48 +00:00
Sebastian Berm
0d66e86f83
Added function to library 2020-07-30 11:19:54 +02:00
Sebastian Berm
dbb8575771
Update to playback to support br's with newlines. 2020-07-30 11:17:53 +02:00
Anton Georgiev
614e4dd68f
Remove event: from welcomeMessage link
Obsolete in html5 and also was breaking the message sanitizer
2020-07-29 17:24:08 -04:00
Anton Georgiev
5e99cd900b
Merge pull request #10153 from antobinary/locales-2020-07-29
Only allow for https uri in welcome and modOnly messages
2020-07-29 16:32:45 -04:00
Anton Georgiev
0d6faa0b57 only allow for https uri in welcome and modOnly messages 2020-07-29 16:08:47 -04:00
Fred Dixon
f7750ce2a3
Merge pull request #10151 from pedrobmarin/develop-full-audio-socket-check
Add a minimum socket validation to full-audio connection
2020-07-29 15:46:51 -04:00
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
Pedro Beschorner Marin
ab31861544 Add a minimum socket validation to full-audio connection 2020-07-29 15:51:19 -03: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
Anton Georgiev
570f482d4c
Merge pull request #10144 from vitormateusalmeida/layout-manager-2
Add Layout Context and Layout Manager
2020-07-29 10:00:59 -04:00
Fred Dixon
869e0d812a
Merge pull request #10142 from bigbluebutton/dependabot/npm_and_yarn/bbb-webhooks/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19 in /bbb-webhooks
2020-07-28 16:32:46 -04:00
dependabot[bot]
1def72af99
Bump lodash from 4.17.15 to 4.17.19 in /bbb-webhooks
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-28 20:26:32 +00:00
KDSBrowne
6872a07d04 fix chat poll result calculation to match whiteboard 2020-07-28 19:22:05 +00:00
Anton Georgiev
6054eb971a
Merge pull request #10134 from KDSBrowne/dev2.3-setDefault-raise-hand
Set raise hand notification / sound on by default
2020-07-28 12:36:31 -04:00
KDSBrowne
5a158eaab0 turn on raise hand notification / sound by default 2020-07-28 16:13:20 +00:00
Anton Georgiev
c7bb723188
Merge pull request #10133 from antobinary/2020-07-28-package-lock
Add missing package-lock info for "hark"
2020-07-28 11:18:13 -04:00
Anton Georgiev
0a9eccbe9b add missing package-lock info for "hark" 2020-07-28 15:14:49 +00:00
Anton Georgiev
55d8d4b199
Merge pull request #9529 from Tainan404/issue-9128
Rework locales list generation
2020-07-28 11:10:38 -04:00
Anton Georgiev
575296ec83
Merge pull request #9851 from KDSBrowne/issue-9647
Add notification when mic is muted while speaking
2020-07-28 11:06:19 -04:00
Anton Georgiev
7744817130
Merge branch 'develop' into issue-9647 2020-07-28 10:48:13 -04:00
Anton Georgiev
6a738a43d5
Merge pull request #8464 from KDSBrowne/add-upload-toast
Non-blocking presentation upload
2020-07-28 10:40:41 -04:00
Anton Georgiev
b87b619fdd
Merge pull request #9964 from KDSBrowne/dev2.3-raise-hand-toast
Improve toast notification for raised hands
2020-07-28 10:29:21 -04:00
KDSBrowne
1ad09b7046 fix poll chat message grouping / unread counter not updating for polls 2020-07-28 12:55:21 +00: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
aec321ee60
Merge pull request #10117 from tdjac0bs/bbb_web_improvements
Improvements on web and bbb-libreoffice
2020-07-24 12:26:00 -04:00
Tiago Jacobs
edb4755cd7 Lock libreoffice container network 2020-07-24 12:29:24 -03:00