Commit Graph

54391 Commits

Author SHA1 Message Date
Nextcloud bot 1bd5d0b10e
[tx-robot] updated from transifex 2020-12-16 02:21:00 +00:00
Nextcloud bot 200cc52aad
[tx-robot] updated from transifex 2020-12-15 02:22:32 +00:00
Nextcloud bot 0113df4f3b
[tx-robot] updated from transifex 2020-12-14 02:19:45 +00:00
Nextcloud bot 56df531fd1
[tx-robot] updated from transifex 2020-12-13 02:18:51 +00:00
Nextcloud bot cb1725f3d8
[tx-robot] updated from transifex 2020-12-12 02:19:05 +00:00
Nextcloud bot a18dea7c85
[tx-robot] updated from transifex 2020-12-11 02:20:35 +00:00
Nextcloud bot f2ee49e1cf
[tx-robot] updated from transifex 2020-12-10 02:20:35 +00:00
Roeland Jago Douma 83b2058367
Merge pull request #24622 from nextcloud/version/19.0.6/final
19.0.6
2020-12-09 20:31:02 +01:00
Roeland Jago Douma 5d74b462e1
19.0.6
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-09 20:08:35 +01:00
Nextcloud bot aa3af0f128
[tx-robot] updated from transifex 2020-12-09 02:20:06 +00:00
Nextcloud bot 635039c8ae
[tx-robot] updated from transifex 2020-12-08 02:20:41 +00:00
Roeland Jago Douma f3bf4b4b1e
Merge pull request #24585 from nextcloud/version/19.0.6/RC2
19.0.6 RC2
2020-12-07 20:35:53 +01:00
Roeland Jago Douma 7bff8a4c65
Merge pull request #24564 from nextcloud/backport/24552/stable19
[stable19] Remember me is not an app_password
2020-12-07 11:56:43 +01:00
Roeland Jago Douma 71e406627e
Merge pull request #24561 from nextcloud/backport/24557/stable19
[stable19] [stable20] dont use system composer for autoload checker
2020-12-07 11:55:49 +01:00
Roeland Jago Douma 1d1bd4a61f
19.0.6 RC2
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-07 11:45:30 +01:00
Roeland Jago Douma 6091ae9648
Merge pull request #24583 from nextcloud/backport/24581/stable19
[stable19] Do not load nonexisting setup.js
2020-12-07 11:16:04 +01:00
Julius Härtl 262f0f8b50 Do not load nonexisting setup.js
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-07 08:23:27 +00:00
Nextcloud bot ef6a602868
[tx-robot] updated from transifex 2020-12-07 02:21:00 +00:00
Nextcloud bot 926138801c
[tx-robot] updated from transifex 2020-12-06 02:19:47 +00:00
Nextcloud bot 503fd6aea3
[tx-robot] updated from transifex 2020-12-05 02:19:10 +00:00
Morris Jobke ec270ce35e Fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-04 15:56:38 +00:00
Roeland Jago Douma a5951d0d79 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:32 +00:00
Julius Härtl 0f576303a3 Force composer v1
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-04 15:20:03 +00:00
Robin Appelman edb9104271 cleanup after autoloader generation
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-04 15:20:01 +00:00
Robin Appelman 47fae3d6cd 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 15:19:59 +00:00
Roeland Jago Douma 8a93263b86
Merge pull request #24554 from nextcloud/backport/24550/stable19
[stable19] Generate a new session id if the decrypting the session data fails
2020-12-04 16:09:40 +01:00
Roeland Jago Douma ca917c59e1 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:58:13 +00:00
Nextcloud bot 2ade35f6da
[tx-robot] updated from transifex 2020-12-04 02:19:42 +00:00
Morris Jobke 6002f5dad8
Merge pull request #24471 from nextcloud/version/19.0.6/RC1
19.0.6 RC1
2020-12-03 13:33:01 +01:00
Roeland Jago Douma 133fbac24d
19.0.6 RC1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 11:17:41 +01:00
Roeland Jago Douma 6ff0d24ba6
Merge pull request #24528 from nextcloud/backport/24519/stable19
[stable19] Fix vsprint parameter
2020-12-03 09:37:30 +01:00
Roeland Jago Douma bf9888870c 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:06 +00:00
Morris Jobke 80efa644f6
Merge pull request #24518 from nextcloud/backport/24459/stable19
[stable19] Only execute plain mimetype check for directories and do the fallback…
2020-12-03 09:15:33 +01:00
Morris Jobke c4d29cc3f1
Merge pull request #24514 from nextcloud/backport/24501/stable19
[stable19] set mountid for personal external storage mounts
2020-12-03 09:09:09 +01:00
John Molakvoæ 769f4daece
Merge pull request #24492 from nextcloud/backport/24376/stable19
[stable19] fix loading mtime of new file in conflict dialog in firefox
2020-12-03 07:44:33 +01:00
Nextcloud bot 253aeb3049
[tx-robot] updated from transifex 2020-12-03 02:20:10 +00:00
Morris Jobke a305573abd 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:05:09 +00:00
Robin Appelman a2300b4968 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 19:02:55 +00:00
Robin Appelman 3b9a432136 set mountid for personal external storage mounts
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-02 18:55:13 +00:00
Roeland Jago Douma fb874e5d6d
Merge pull request #24508 from nextcloud/backport/23257/stable19
[stable19] Fix file size computation on 32bit platforms
2020-12-02 19:51:10 +01:00
aler9 349f754833 Fix file size computation on 32bit platforms
Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
2020-12-02 15:27:22 +00:00
Christoph Wurst 32b7a0e13f
Merge pull request #24503 from nextcloud/backport/24499/stable19
[stable19] Harden setup check for TLS version if host is not reachable
2020-12-02 16:06:08 +01:00
Morris Jobke 2ff7bc51a7 Harden setup check for TLS version if host is not reachable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 13:30:23 +00:00
John Molakvoæ 379bb17a48
Merge pull request #24386 from nextcloud/backport/24382/stable19
[stable19] Properly encode path when fetching inherited shares
2020-12-02 12:20:07 +01:00
Julius Härtl 85177501a4 Properly encode path when fetching inherited shares
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-12-02 08:28:34 +00:00
Nextcloud bot 6f97488915
[tx-robot] updated from transifex 2020-12-02 02:20:28 +00:00
Morris Jobke e4bccaf624
Merge pull request #24484 from nextcloud/backport/24094/stable19
[stable19] Only attempt to move to trash if a file is not in appdata
2020-12-01 23:03:18 +01:00
Julius Härtl 59e60a0756
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:02:43 +01:00
Morris Jobke 6c7b0faeec
Merge pull request #24480 from nextcloud/backport/24242/stable19
[stable19] Update ScanLegacyFormat.php
2020-12-01 13:42:07 +01:00
essys f5e1da1aa9 Update ScanLegacyFormat.php
Fixed a small typo on line 99.
2020-12-01 12:09:42 +00:00