aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't log params of imagecreatefromstringVincent Petry2020-12-041-0/+3
| | | | | | To prevent flooding the log with actual image data. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* Merge pull request #24474 from ↵Christoph Wurst2020-12-042-1/+25
|\ | | | | | | | | nextcloud/enhancement/unified-search-result-attributes Allow unified search results to have attributes
| * Add attributes to file search resultsChristoph Wurst2020-12-031-1/+4
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Allow unified search results to have attributesChristoph Wurst2020-12-031-0/+21
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | [tx-robot] updated from transifexNextcloud bot2020-12-0434-0/+34
| |
* | Merge pull request #24535 from nextcloud/fix/multiple_file_downloadRoeland Jago Douma2020-12-031-0/+1
|\ \ | |/ |/| Fix the download of multiple files from the webUI
| * Fix the download of multiple files from the webUIRoeland Jago Douma2020-12-031-0/+1
| | | | | | | | | | | | needed a setupFS call Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #24358 from nextcloud/dav-storage-copyMorris Jobke2020-12-031-2/+24
|\ \ | |/ |/| use storage copy implementation when doing dav copy
| * use storage copy implementation when doing dav copyRobin Appelman2020-11-241-2/+24
| | | | | | | | | | | | | | | | instead of using the sabredav fallback (which does a read+write stream copy) this greatly speeds up dav copies Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #24498 from nextcloud/enhancement/nextcloud-log-normalizerJoas Schilling2020-12-032-2/+1
|\ \ | | | | | | Replace abandoned log normalizer with our fork
| * | Replace abandoned log normalizer with our forkChristoph Wurst2020-12-032-2/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #24409 from nextcloud/bugfix/24399Morris Jobke2020-12-032-2/+4
|\ \ \ | | | | | | | | Also run repair steps when encryption is disabled but a legacy key is present
| * | | Also handle legacy cipher support when encryption is disabled but an old ↵Julius Härtl2020-12-032-2/+4
| |/ / | | | | | | | | | | | | | | | master key is present Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #24516 from nextcloud/enh/23278/add-icon-for-notificationChristoph Wurst2020-12-031-3/+8
|\ \ \ | |/ / |/| | Add icon to user limit notification
| * | Improve wordingMorris Jobke2020-12-021-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Add icon to user limit notificationMorris Jobke2020-12-021-1/+6
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #24519 from nextcloud/fix/bug/emailtemplateMorris Jobke2020-12-032-2/+2
|\ \ \ | | | | | | | | Fix vsprint parameter
| * | | Fix vsprint parameterRoeland Jago Douma2020-12-032-2/+2
| |/ / | | | | | | | | | | | | | | | | | | %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>
* | | Merge pull request #24429 from nextcloud/3rdparty/closureChristoph Wurst2020-12-035-8/+19
|\ \ \ | | | | | | | | [3rdparty] Migrate to Opis/Closure
| * | | Update psalm-baseline.xmlMorris Jobke2020-12-021-0/+15
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | [3rdparty] Migrate to Opis/ClosureRoeland Jago Douma2020-12-024-8/+4
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #24524 from ↵Morris Jobke2020-12-031-1/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud-pr-bot/automated/noid/psalm-baseline-update [Automated] Update psalm-baseline.xml
| * | | Update psalm baselineNextcloud-PR-Bot2020-12-031-1/+1
|/ / / | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-12-036-6/+58
| | |
* | | Merge pull request #24459 from ↵Morris Jobke2020-12-021-2/+6
|\ \ \ | |/ / |/| | | | | | | | nextcloud/fix/23096/workflow-fix-mimetype-check-for-directories Only execute plain mimetype check for directories and do the fallback…
| * | Only execute plain mimetype check for directories and do the fallback only ↵Morris Jobke2020-11-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | for non-directories Ref #23096 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #24113 from nextcloud/extend-cache-eventsRoeland Jago Douma2020-12-0211-12/+159
|\ \ \ | | | | | | | | extend cache events
| * | | code style and dispatchTypedRobin Appelman2020-12-023-4/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | rename cache event to follow new naming standardsRobin Appelman2020-11-268-17/+103
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | extend cache eventsRobin Appelman2020-11-267-5/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - adds cache remove event - expose storage id in event - emit events during cache move Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #24501 from nextcloud/personal-external-mount-idRoeland Jago Douma2020-12-022-3/+5
|\ \ \ \ | | | | | | | | | | set mountid for personal external storage mounts
| * | | | set mountid for personal external storage mountsRobin Appelman2020-12-022-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #23278 from nextcloud/enh/noid/user-limitsChristoph Wurst2020-12-0211-12/+259
|\ \ \ \ \ | | | | | | | | | | | | Allow subscription to indicate that a userlimit is reached
| * | | | | Add notification for user limitMorris Jobke2020-12-026-8/+67
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Allow subscription to indicate that a userlimit is reachedMorris Jobke2020-12-027-7/+195
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #24419 from ↵dependabot-preview[bot]2020-12-0212-14/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/underscore-1.12.0
| * | | | | | Bump underscore from 1.11.0 to 1.12.0dependabot-preview[bot]2020-12-0212-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Merge pull request #23257 from aler9/patch-32bit-filesize-masterMorris Jobke2020-12-021-5/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix file size computation on 32bit platforms
| * | | | | | | Fix file size computation on 32bit platformsaler92020-12-021-5/+4
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
* | | | | | | Merge pull request #24396 from nextcloud/dont-use-system-composerMorris Jobke2020-12-02106-95/+143
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | dont use system composer for autoload checker
| * | | | | | | cleanup after autoloader generationRobin Appelman2020-12-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | rebuild autoloader scripts with 2.0.7Robin Appelman2020-11-26104-78/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | dont use system composer for autoload checkerRobin Appelman2020-11-262-17/+11
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this ensures that the same composer version is used by everyone (and ci) Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #24500 from nextcloud/bugfix/noid/log_query_no_crashRoeland Jago Douma2020-12-021-17/+25
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Prevent log_query to mess up regular execution flow
| * | | | | | Prevent log_query to mess up regular execution flowVincent Petry2020-12-021-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Merge pull request #24348 from hosting-de/feature/console-user-display-nameMorris Jobke2020-12-021-10/+37
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Wrap display_name similarly to email to allow changes via occ
| * | | | | | Wrap display_name similarly to email to allow changes via occJohannes Leuker2020-12-021-10/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Leuker <j.leuker@hosting.de>
* | | | | | | Merge pull request #24499 from nextcloud/fix/noid/harden-setup-checksblizzz2020-12-021-0/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Harden setup check for TLS version if host is not reachable
| * | | | | | Harden setup check for TLS version if host is not reachableMorris Jobke2020-12-021-0/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #24376 from nextcloud/existing-dialog-ffMorris Jobke2020-12-025-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix loading mtime of new file in conflict dialog in firefox