233d4164a6
Merge pull request #24553 from nextcloud/backport/24550/stable20
...
[stable20] Generate a new session id if the decrypting the session data fails
2020-12-04 16:09:52 +01:00
c7cb8eb007
Merge pull request #24556 from nextcloud/revert/stable20/21090
...
Revert "Do not read certificate bundle from data dir by default"
2020-12-04 15:09:22 +01:00
b1e9752169
Revert "Do not read certificate bundle from data dir by default"
...
This reverts commit 18b0d753f2
2020-12-04 13:37:10 +01:00
f52337e8be
Generate a new session id if the decrypting the session data fails
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-04 11:55:31 +00:00
a53871f629
[tx-robot] updated from transifex
2020-12-04 02:19:34 +00:00
84250221d7
Merge pull request #24472 from nextcloud/version/20.0.3/RC1
...
20.0.3 RC1
2020-12-03 13:49:47 +01:00
8f2ba14e0a
20.0.3 RC1
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 13:11:53 +01:00
55a76ab3e2
Merge pull request #24534 from nextcloud/3rdparty/stable20/archive_tar
...
[3rdparty][security] Archive TAR to 1.4.11
2020-12-03 13:11:12 +01:00
ce953d1571
Merge pull request #24532 from nextcloud/backport/24409/stable20
...
[stable20] Also run repair steps when encryption is disabled but a legacy key is present
2020-12-03 12:22:41 +01:00
a91320ff0c
[3rdparty][security] Archive TAR to 1.4.11
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 11:28:41 +01:00
1a041f7ac7
Merge pull request #24530 from nextcloud/fix/stable20-nextcloud-log-normalizer
...
[stable20] Replace abandoned log normalizer with our fork
2020-12-03 11:14:46 +01:00
73f854dc0a
Merge pull request #24531 from nextcloud/backport/24516/stable20
...
[stable20] Add icon to user limit notification
2020-12-03 11:14:03 +01:00
ff0d6c1cb9
Merge pull request #24527 from nextcloud/backport/24519/stable20
...
[stable20] Fix vsprint parameter
2020-12-03 11:00:56 +01:00
14d95cb2e3
Also handle legacy cipher support when encryption is disabled but an old master key is present
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-03 09:56:59 +00:00
4c5662a658
Improve wording
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-03 09:00:56 +00:00
3d132f293f
Add icon to user limit notification
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-03 09:00:54 +00:00
67e5af58ed
Replace abandoned log normalizer with our fork
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-03 09:50:10 +01:00
f6c24133a4
Merge pull request #24517 from nextcloud/backport/24459/stable20
...
[stable20] Only execute plain mimetype check for directories and do the fallback…
2020-12-03 09:37:44 +01:00
428f0ec151
Fix vsprint parameter
...
%2\$; is not valid. On php7 this is just ignored but on php8 it gives an
error. %2\$s; works.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 08:20:04 +00:00
6093d1bcc1
[tx-robot] updated from transifex
2020-12-03 02:20:01 +00:00
1181058d18
Only execute plain mimetype check for directories and do the fallback only for non-directories
...
Ref #23096
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 20:02:27 +00:00
54ab2b9f28
Merge pull request #24513 from nextcloud/backport/24501/stable20
...
[stable20] set mountid for personal external storage mounts
2020-12-02 20:50:08 +01:00
bdbb60a67b
Merge pull request #24509 from nextcloud/backport/23257/stable20
...
[stable20] Fix file size computation on 32bit platforms
2020-12-02 20:03:24 +01:00
987cd0d5ed
set mountid for personal external storage mounts
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-02 18:50:58 +00:00
4d68c618e3
Merge pull request #24511 from nextcloud/backport/23278/stable20
...
[stable20] Allow subscription to indicate that a userlimit is reached
2020-12-02 19:47:18 +01:00
a8780debd3
Add notification for user limit
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:44 +00:00
d2fd49c461
Allow subscription to indicate that a userlimit is reached
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:42 +00:00
02427cd76f
Merge pull request #24491 from nextcloud/backport/24376/stable20
...
[stable20] fix loading mtime of new file in conflict dialog in firefox
2020-12-02 16:45:17 +01:00
dc7eb53a8f
Fix file size computation on 32bit platforms
...
Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
2020-12-02 15:27:30 +00:00
e8b284e807
Merge pull request #24502 from nextcloud/backport/24499/stable20
...
[stable20] Harden setup check for TLS version if host is not reachable
2020-12-02 16:14:12 +01:00
03956c5862
Harden setup check for TLS version if host is not reachable
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 13:27:43 +00:00
1f6e5c6d8e
fix loading mtime of new file in conflict dialog in firefox
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-12-02 07:37:19 +00:00
2a0c0ea584
[tx-robot] updated from transifex
2020-12-02 02:20:20 +00:00
4949429567
Merge pull request #24477 from nextcloud/backport/24189/stable20
...
[stable20] Set frame-ancestors to none if none are filled
2020-12-01 23:44:35 +01:00
41cc1f7360
Merge pull request #24478 from nextcloud/backport/24186/stable20
...
[stable20] Move the password fiels of chaging passwords to post
2020-12-01 23:29:35 +01:00
74f734dc97
Merge pull request #24479 from nextcloud/backport/24188/stable20
...
[stable20] Move the global password for files external to post
2020-12-01 23:28:33 +01:00
910fecf8f8
Merge pull request #24483 from nextcloud/backport/24094/stable20
...
[stable20] Only attempt to move to trash if a file is not in appdata
2020-12-01 23:20:48 +01:00
3fb850940f
Set frame-ancestors to none if none are filled
...
frame-ancestors doesn't fall back to default-src. So when we apply a
very restricted CSP we should make sure to set it to 'none' and not
leave it empty.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-01 22:23:13 +01:00
3e982a3346
Move the password fiels of chaging passwords to post
...
* This is not actually used with GET (obviously). But else some scanners
trip on it
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-01 22:23:02 +01:00
c24534866b
Move the global password for files external to post
...
Again more false positives in some scanners
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-01 22:22:33 +01:00
7d786a4e37
Only attempt to move to trash if a file is not in appdata
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-01 22:20:11 +01:00
86da5013c8
Merge pull request #24325 from nextcloud/backport/24103/stable20
...
[stable20] Only check path for being accessible when the storage is a object home
2020-12-01 11:04:22 +01:00
ebf046bc15
Merge pull request #24462 from nextcloud/backport/24460/stable20
...
[stable20] Use correct l10n source in files_sharing JS code
2020-12-01 08:48:16 +01:00
965614f3e2
[tx-robot] updated from transifex
2020-12-01 02:19:56 +00:00
fba0145bef
Use correct l10n source in files_sharing JS code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-30 19:30:28 +00:00
d56300a86c
Merge pull request #24455 from nextcloud/backport/24451/stable20
...
[stable20] external storages: save group ids not display names in configuration
2020-11-30 17:22:42 +01:00
4a2b72dcbe
Merge pull request #24453 from nextcloud/backport/24449/stable20
...
[stable20] Store scss variables under a different prefix for each theming config version
2020-11-30 16:54:02 +01:00
a6d288e1ac
save group ids not display names in configuration
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-30 14:49:11 +00:00
7d57b2c317
Store scss variables under a different prefix for each theming config version
...
The main issue with using the general theming- prefix is that with APCu caching
the cache is not shared between processes, so when trying to reset the cache
through the CLI, e.g. when updating the theming config the old cache is never
invalidated.
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-30 14:24:28 +00:00
6916240d98
Merge pull request #24446 from nextcloud/backport/23652/stable20
...
[stable20] Fix public calendars shared to circles
2020-11-30 11:24:38 +01:00
Roeland Jago Douma
Morris Jobke
Roeland Jago Douma
Nextcloud bot
Julius Härtl
Christoph Wurst
Robin Appelman
Greta
aler9
Arthur Schiwon