Commit Graph

55869 Commits

Author SHA1 Message Date
Nextcloud bot 4a51875a73
[tx-robot] updated from transifex 2020-12-10 02:20:27 +00:00
Roeland Jago Douma 9c053c6660
Merge pull request #24621 from nextcloud/version/20.0.3/final
20.0.3
2020-12-09 20:24:07 +01:00
Roeland Jago Douma 7830a6dd14
20.0.3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-09 20:05:53 +01:00
Nextcloud bot f413277fe1
[tx-robot] updated from transifex 2020-12-09 02:19:57 +00:00
Nextcloud bot c007cd01e9
[tx-robot] updated from transifex 2020-12-08 02:20:33 +00:00
Roeland Jago Douma 0576ca83fd
Merge pull request #24584 from nextcloud/version/20.0.3/RC2
20.0.3 RC2
2020-12-07 21:20:14 +01:00
Roeland Jago Douma b9011c1d1d
Merge pull request #24563 from nextcloud/backport/24552/stable20
[stable20] Remember me is not an app_password
2020-12-07 11:52:17 +01:00
Roeland Jago Douma d73ba6595a
20.0.3 RC2
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-07 11:44:46 +01:00
Roeland Jago Douma 519ce1add9
Merge pull request #24582 from nextcloud/backport/24581/stable20
[stable20] Do not load nonexisting setup.js
2020-12-07 11:16:12 +01:00
Julius Härtl 6e2dc3e4f0 Do not load nonexisting setup.js
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-07 08:20:02 +00:00
Nextcloud bot b8e8bc5ddd
[tx-robot] updated from transifex 2020-12-07 02:20:52 +00:00
Nextcloud bot 80ef7e14da
[tx-robot] updated from transifex 2020-12-06 02:19:39 +00:00
Nextcloud bot 4a2abf3d49
[tx-robot] updated from transifex 2020-12-05 02:19:00 +00:00
Morris Jobke 607e902070 Fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-04 15:56:29 +00:00
Roeland Jago Douma e6947bd6ca Remember me is not an app_password
While technically they are stored the same. This session variable is
used to indicate that a user is using an app password to authenticate.
Like from a client. Or when having it generated automatically.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-04 15:56:24 +00:00
Christoph Wurst d22fb14d92
Merge pull request #24557 from nextcloud/bugfix/noid/force-composerv1/stable20
[stable20] dont use system composer for autoload checker
2020-12-04 16:17:26 +01:00
Roeland Jago Douma 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
Roeland Jago Douma 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
Julius Härtl 55b9e554ec
Force composer v1
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-04 14:27:35 +01:00
Robin Appelman c55197791a
cleanup after autoloader generation
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-04 14:27:14 +01:00
Robin Appelman ec041c3ad5
dont use system composer for autoload checker
this ensures that the same composer version is used by everyone (and ci)

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-04 14:27:03 +01:00
Morris Jobke b1e9752169
Revert "Do not read certificate bundle from data dir by default"
This reverts commit 18b0d753f2.
2020-12-04 13:37:10 +01:00
Roeland Jago Douma 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
Nextcloud bot a53871f629
[tx-robot] updated from transifex 2020-12-04 02:19:34 +00:00
Morris Jobke 84250221d7
Merge pull request #24472 from nextcloud/version/20.0.3/RC1
20.0.3 RC1
2020-12-03 13:49:47 +01:00
Roeland Jago Douma 8f2ba14e0a
20.0.3 RC1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 13:11:53 +01:00
Morris Jobke 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
Roeland Jago Douma 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
Roeland Jago Douma 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
Morris Jobke 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
Morris Jobke 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
Roeland Jago Douma ff0d6c1cb9
Merge pull request #24527 from nextcloud/backport/24519/stable20
[stable20] Fix vsprint parameter
2020-12-03 11:00:56 +01:00
Julius Härtl 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
Morris Jobke 4c5662a658 Improve wording
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-03 09:00:56 +00:00
Morris Jobke 3d132f293f Add icon to user limit notification
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-03 09:00:54 +00:00
Christoph Wurst 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
Roeland Jago Douma 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
Roeland Jago Douma 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
Nextcloud bot 6093d1bcc1
[tx-robot] updated from transifex 2020-12-03 02:20:01 +00:00
Morris Jobke 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
Morris Jobke 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
Roeland Jago Douma 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
Robin Appelman 987cd0d5ed set mountid for personal external storage mounts
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-02 18:50:58 +00:00
Roeland Jago Douma 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
Morris Jobke a8780debd3 Add notification for user limit
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:44 +00:00
Morris Jobke 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
Greta 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
aler9 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
Morris Jobke 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
Morris Jobke 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