Commit Graph

56609 Commits

Author SHA1 Message Date
Roeland Jago Douma f0862dcfaa
Merge pull request #24552 from nextcloud/enh/remember_me_is_not_app_password
Remember me is not an app_password
2020-12-04 16:35:44 +01:00
Morris Jobke 0d7819eb6c
Merge pull request #24550 from nextcloud/enh/fix/new_session_id_if_decrypt_fails
Generate a new session id if the decrypting the session data fails
2020-12-04 12:52:59 +01:00
Morris Jobke 5cc348ae72
Fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-04 12:51:45 +01:00
Roeland Jago Douma 48b4b83b5a
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 12:40:28 +01:00
Roeland Jago Douma 858f623081
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:42:40 +01:00
Joas Schilling cb7b8998e4
Merge pull request #24545 from nextcloud/bugfix/noid/force-composerv2
Always install composer v2
2020-12-04 10:56:35 +01:00
Morris Jobke 3c62d2bcae
Merge pull request #24543 from nextcloud/bugfix/noid/dont-log-image-as-string
Don't log params of imagecreatefromstring
2020-12-04 10:42:49 +01:00
Julius Härtl a1a4fa2ac2
Always install composer v2
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-04 10:11:02 +01:00
Vincent Petry 9b3361ce87
Don't log params of imagecreatefromstring
To prevent flooding the log with actual image data.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-04 09:30:20 +01:00
Christoph Wurst 32ded877dc
Merge pull request #24474 from nextcloud/enhancement/unified-search-result-attributes
Allow unified search results to have attributes
2020-12-04 08:42:15 +01:00
Nextcloud bot 3f88dbd259
[tx-robot] updated from transifex 2020-12-04 02:19:19 +00:00
Roeland Jago Douma 7d9004c885
Merge pull request #24535 from nextcloud/fix/multiple_file_download
Fix the download of multiple files from the webUI
2020-12-03 18:59:39 +01:00
Christoph Wurst 885dabb761
Add attributes to file search results
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-03 18:24:33 +01:00
Christoph Wurst cc92d5a293
Allow unified search results to have attributes
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-03 18:24:33 +01:00
Morris Jobke fc57f60ece
Merge pull request #24358 from nextcloud/dav-storage-copy
use storage copy implementation when doing dav copy
2020-12-03 15:03:13 +01:00
Roeland Jago Douma c9cd633665
Fix the download of multiple files from the webUI
needed a setupFS call

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 13:20:01 +01:00
Joas Schilling 64bc7c79e8
Merge pull request #24498 from nextcloud/enhancement/nextcloud-log-normalizer
Replace abandoned log normalizer with our fork
2020-12-03 11:04:49 +01:00
Morris Jobke d7207d838a
Merge pull request #24409 from nextcloud/bugfix/24399
Also run repair steps when encryption is disabled but a legacy key is present
2020-12-03 10:54:08 +01:00
Christoph Wurst 0e99d3c1a0
Merge pull request #24516 from nextcloud/enh/23278/add-icon-for-notification
Add icon to user limit notification
2020-12-03 09:58:28 +01:00
Julius Härtl 04d67d558e
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:47:05 +01:00
Christoph Wurst 244c53dea1
Replace abandoned log normalizer with our fork
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-03 09:44:25 +01:00
Morris Jobke 4d64ec9944
Merge pull request #24519 from nextcloud/fix/bug/emailtemplate
Fix vsprint parameter
2020-12-03 09:13:58 +01:00
Christoph Wurst fbc06d39c7
Merge pull request #24429 from nextcloud/3rdparty/closure
[3rdparty] Migrate to Opis/Closure
2020-12-03 08:44:53 +01:00
Roeland Jago Douma 3d315ec64f
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:25:11 +01:00
Morris Jobke b52a1e196e
Merge pull request #24524 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2020-12-03 06:47:11 +01:00
Nextcloud-PR-Bot 3c606cbec3 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2020-12-03 04:29:05 +00:00
Nextcloud bot 0dcc227a6b
[tx-robot] updated from transifex 2020-12-03 02:19:51 +00:00
Morris Jobke 2fb31e9b5d
Improve wording
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 21:42:32 +01:00
Morris Jobke 09754461df
Merge pull request #24459 from nextcloud/fix/23096/workflow-fix-mimetype-check-for-directories
Only execute plain mimetype check for directories and do the fallback…
2020-12-02 21:00:05 +01:00
Morris Jobke 40ebe24960
Update psalm-baseline.xml
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 20:27:14 +01:00
Roeland Jago Douma 04c037ebfd
[3rdparty] Migrate to Opis/Closure
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-02 20:16:57 +01:00
Morris Jobke bd0a77269f
Add icon to user limit notification
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 20:13:33 +01:00
Roeland Jago Douma 6f4d3edb5e
Merge pull request #24113 from nextcloud/extend-cache-events
extend cache events
2020-12-02 19:48:20 +01:00
Roeland Jago Douma 82cc9c1382
Merge pull request #24501 from nextcloud/personal-external-mount-id
set mountid for personal external storage mounts
2020-12-02 19:48:05 +01:00
Christoph Wurst 4deff37a3c
Merge pull request #23278 from nextcloud/enh/noid/user-limits
Allow subscription to indicate that a userlimit is reached
2020-12-02 18:22:13 +01:00
dependabot-preview[bot] dc3e05b69a
Merge pull request #24419 from nextcloud/dependabot/npm_and_yarn/underscore-1.12.0 2020-12-02 15:34:57 +00:00
Morris Jobke e580f91143
Merge pull request #23257 from aler9/patch-32bit-filesize-master
Fix file size computation on 32bit platforms
2020-12-02 16:22:24 +01:00
Morris Jobke 32f6bdf067
Merge pull request #24396 from nextcloud/dont-use-system-composer
dont use system composer for autoload checker
2020-12-02 16:15:55 +01:00
Roeland Jago Douma d69407963c
Merge pull request #24500 from nextcloud/bugfix/noid/log_query_no_crash
Prevent log_query to mess up regular execution flow
2020-12-02 16:15:26 +01:00
Robin Appelman aef1cdba03
code style and dispatchTyped
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-02 16:15:02 +01:00
Morris Jobke c0a05c0412
Add notification for user limit
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 15:20:03 +01:00
Morris Jobke d87705a894
Allow subscription to indicate that a userlimit is reached
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 15:20:03 +01:00
dependabot-preview[bot] 3db459565c Bump underscore from 1.11.0 to 1.12.0
Bumps [underscore](https://github.com/jashkenas/underscore) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/jashkenas/underscore/releases)
- [Commits](https://github.com/jashkenas/underscore/compare/1.11.0...1.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-12-02 14:17:13 +00:00
Morris Jobke e25a62c69d
Merge pull request #24348 from hosting-de/feature/console-user-display-name
Wrap display_name similarly to email to allow changes via occ
2020-12-02 15:05:20 +01:00
Robin Appelman ef016f71c3
cleanup after autoloader generation
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-02 15:02:56 +01:00
Robin Appelman 8d962579db
set mountid for personal external storage mounts
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-02 14:25:48 +01:00
blizzz 0da8221327
Merge pull request #24499 from nextcloud/fix/noid/harden-setup-checks
Harden setup check for TLS version if host is not reachable
2020-12-02 14:24:43 +01:00
Vincent Petry a50bcdabcc
Prevent log_query to mess up regular execution flow
When the "log_query" debug config parameter is set, SQL queries are
logged. However, if an error occurs when converting the values to
string, it will abort the request.

This fix catches the error and continues instead.

Also added handler for DateTime value which is already known to cause
aborts here.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-02 14:10:35 +01:00
Morris Jobke fe79a1ad3e
Harden setup check for TLS version if host is not reachable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 13:17:05 +01:00
aler9 ac0c7a8fe0 Fix file size computation on 32bit platforms
Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
2020-12-02 12:05:14 +01:00