Commit Graph

26546 Commits

Author SHA1 Message Date
Anton Georgiev
4e636a2396
Merge pull request #9518 from KDSBrowne/issue-9511
Change shared notes lock behavior
2020-05-12 17:55:48 -04:00
KDSBrowne
43a9f04edf localise string 2020-05-12 21:34:07 +00:00
KDSBrowne
26143e5889 prevent user item unlock affecting shared notes 2020-05-12 21:21:56 +00:00
Anton Georgiev
d30526f934
Merge pull request #9515 from KDSBrowne/2.2-add-username-remove-confirmation
Add user name to remove user modal
2020-05-12 17:10:22 -04:00
KDSBrowne
4c23e060bf add username to remove confirmation title / update modal description 2020-05-12 21:04:07 +00:00
KDSBrowne
c28b0108ea prevent user item displaying as locked for shared notes lock 2020-05-12 19:43:10 +00:00
KDSBrowne
5f4676ec63 show lock by moderator label on shared notes 2020-05-12 19:07:01 +00:00
KDSBrowne
321d2cbd37 hide default content conponent if hidePresentation and autoSwapLayout 2020-05-12 14:42:34 +00:00
KDSBrowne
f5d004c322 restore minimized presentation for viewer (slide or zoom change / published poll / added annotation) 2020-05-12 12:58:14 +00:00
Anton Georgiev
851e63f557
Merge pull request #9505 from antobinary/locales-2020-05-11
Pulled HTML5 locales May 11, 2020
2020-05-11 16:39:49 -04:00
yogiks
360fce9781 Included Kannada 2020-05-11 15:40:00 -04:00
yogiks
228b3c7327 Pulled Kannada (kn.json) from Transifex 2020-05-11 15:39:40 -04:00
Anton Georgiev
bff29e28ad Pulled HTML5 locales May 11, 2020 2020-05-11 15:36:31 -04:00
Anton Georgiev
4b03c707a2
Merge pull request #9407 from KDSBrowne/issue-9297
Fix 'See other viewers in the Users list' lock enforcing lock on 'See other viewers webcams'
2020-05-11 15:06:38 -04:00
Anton Georgiev
21375864fe
Merge pull request #9477 from KDSBrowne/issue-9302
Localize default poll options before calculating annotation required space
2020-05-11 14:48:22 -04:00
Anton Georgiev
29f5154fcc
Merge pull request #9481 from KDSBrowne/issue-9450
Close video preview modal when "share webcam" lock activated
2020-05-11 14:38:20 -04:00
Anton Georgiev
83339fe15e
Merge pull request #9501 from antobinary/remove-files-with-incompatible-license
Remove files containing incompatible (to BBB) license
2020-05-11 14:05:12 -04:00
Anton Georgiev
ee3175cf86
Merge pull request #9408 from KDSBrowne/2.2-fix-selected-user
Set correct state in user list for selected user onClick
2020-05-11 12:55:29 -04:00
Anton Georgiev
97acff2433
Merge pull request #9475 from KDSBrowne/remove-user-confirmation
Adds remove user confirmation
2020-05-11 12:17:12 -04:00
Anton Georgiev
d733cf1685
Merge pull request #9499 from antobinary/test-9173
Rebasing for v2.2.x-release #9173 customSvgIcon css class bug fixed for rtl layouts
2020-05-11 12:07:53 -04:00
Farzad Akbarinezhad
dd16e636ed customSvgIcon css class bug fixed for rtl layouts
in RTL layout, selecting colors and font thickness parts in whiteboard, will not appear correctly when they expand; one item will be thrown out of the container (overflow).
the following images demonstrate the problems.
adding some additional style to customSvgIcon class in css will fix the bug.

http://up.maralhost.com/do.php?img=359
http://up.maralhost.com/do.php?img=364
2020-05-11 12:03:17 -04:00
Anton Georgiev
d10ab8f4af Remove files containing incompatible (to BBB) license 2020-05-11 11:53:48 -04:00
KDSBrowne
eaccf8364c add outline to poll annotation text 2020-05-11 12:56:53 +00:00
Fred Dixon
9b78e0ce89
Merge pull request #9483 from basisbit/patch-1
enable deletion of 14d old already published raw recordings by default
2020-05-09 22:50:55 -04:00
basisbit
b4825eceb1
enable deletion of 14d old already published raw recordings by default 2020-05-10 04:24:01 +02:00
KDSBrowne
2be89479ba close video preview modal if lock setting active 2020-05-09 17:19:41 +00:00
Anton Georgiev
33af8a0574
Merge pull request #9474 from antobinary/fix-bind-environment
Use Meteor setTimeout to run within Fiber
2020-05-09 09:57:06 -04:00
Anton Georgiev
80e6b168ea use Meteor setTimeout to run within Fiber 2020-05-09 09:52:16 -04:00
Anton Georgiev
27623aac36
Merge pull request #9470 from tdjac0bs/postpone_websocket_close
Postpone websocket close for a failed authToken
2020-05-08 18:17:34 -04:00
Tiago Jacobs
d6132e97b5 Postpone websocket close for a failed authToken 2020-05-08 19:08:50 -03:00
Anton Georgiev
65e6f1507d
Merge pull request #9469 from tdjac0bs/fix_auth_key
Change validateAuthToken key generator and add details to log
2020-05-08 17:50:41 -04:00
Tiago Jacobs
eee9d89668 Add key to log message 2020-05-08 18:47:54 -03:00
Tiago D J
041e16d2dd
Change validateAuthToken key generator (#9468) 2020-05-08 17:47:14 -04:00
Tiago Jacobs
70f39ee758 Change validateAuthToken key generator 2020-05-08 18:45:35 -03:00
KDSBrowne
41e33d9cda localise default poll options before calculating required annotation space 2020-05-08 18:17:50 +00:00
KDSBrowne
2ca54d69f4 add remove user confirmation 2020-05-07 14:32:15 +00:00
KDSBrowne
741455aeba remove hideUserList() from video-provider service 2020-05-06 15:14:07 +00:00
Anton Georgiev
b70ee28a31
Merge pull request #9189 from miztaka/catalyst-fix-calcGuestStatus
Fix calcGuestStatus
2020-05-06 09:11:46 -04:00
Anton Georgiev
c6148fb004
Merge pull request #9419 from jfsiebel/fix-race-condition-add-user-settings
Fix race condition in addUserSettings
2020-05-05 10:20:43 -04:00
Joao Siebel
6f9c8ee8ee Filter by authed users and add projection to the query 2020-05-05 11:19:52 -03:00
Joao Siebel
3b8d10bd8c Fix race condition in addUserSettings 2020-05-04 22:16:52 -03:00
KDSBrowne
f9fa2f36dd set correct state for selected user on click 2020-05-04 13:40:13 +00:00
Fred Dixon
fed60617ae
Merge pull request #9398 from bigbluebutton/bump-to-2-2-10
Update version as we work on 2.2.10
2020-05-03 08:38:29 -04:00
Fred Dixon
3694c2bd4e
Update bigbluebutton-release 2020-05-03 08:37:32 -04:00
KDSBrowne
e82e0f5be9 fix see views in user list lock affecting webcams 2020-05-02 16:50:40 +00:00
Richard Alam
af3de9217b
Merge pull request #9391 from ritzalam/validate-file-paths
Rework file upload and download
2020-05-02 07:55:55 -04:00
Richard Alam
5cde97b139 Reweork file upload and download
- fix filename regex
 - create download flag when uploading file with that can be downloaded
2020-05-02 04:51:32 -07:00
Fred Dixon
49d3b16a2c
Merge pull request #9386 from ritzalam/validate-file-paths
Rework presentation download and upload
2020-05-01 23:26:20 -04:00
Richard Alam
f876ce01c2 Rework presentation download and upload
- verify presentation and meeting id formats
 - construct presentation file path making sure that they are valid
 - add "downloadable" flag to check if presentation can be downloaded or not
 - collect presentation upload errors so we can send to the client in the future
2020-05-01 14:16:42 -07:00
Fred Dixon
f4b7287960
Merge pull request #9365 from KDSBrowne/2.2-prevent-dup-user-styles
Prevent multiple users displaying as selected in user list
2020-04-30 19:49:24 -04:00