summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Revert "[stable21] Update update-psalm-baseline workflow"John Molakvoæ2021-11-041-20/+15
| | | | | | | | | | | | This reverts commit 51accaabe9a4d9196483d17e0fb1de0a26452c35.
* | | [stable21] Update update-psalm-baseline workflowJohn Molakvoæ2021-11-041-15/+20
| |/ |/| | | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
* | Merge pull request #29539 from nextcloud/version/21.0.6/rc1v21.0.6rc1John Molakvoæ2021-11-041-2/+2
|\ \
| * | 21.0.6 RC1Arthur Schiwon2021-11-031-2/+2
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #29322 from nextcloud/mysql-search-ignore-index-21John Molakvoæ2021-11-043-4/+40
|\ \ \
| * | | tell mysql to ignore the sort index for search queriesRobin Appelman2021-10-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql really likes to pick an index for sorting if it can't fully satisfy the where filter with an index, since search queries pretty much never are fully filtered by index mysql often picks an index for sorting instead of the *much* more useful index for filtering. To bypass this, we tell mysql explicitly not to use the mtime (the default order field) index, so it will instead pick an index that is actually useful. Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | allow specifying index hints for mysql search queriesRobin Appelman2021-10-182-3/+33
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #29507 from nextcloud/backport/29281/stable21John Molakvoæ2021-11-042-6/+14
|\ \ \ \
| * | | | Move query outside the loop and reduce chunk size to 1000Sijmen Schoon2021-11-012-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involved changing CacheQueryBuilder\whereParentIn to take a parameter name, renaming the function accordingly. Signed-off-by: Sijmen Schoon <me@sijmenschoon.nl>
| * | | | Limit parameter count per query in Cache.removeChildrenSijmen Schoon2021-11-011-8/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sijmen Schoon <me@sijmenschoon.nl>
* | | | | Merge pull request #29504 from nextcloud/backport/29465/stable21John Molakvoæ2021-11-041-31/+32
|\ \ \ \ \
| * | | | | update CRLArthur Schiwon2021-11-011-31/+32
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #29071 from nextcloud/backport/29056/stable21John Molakvoæ2021-11-042-0/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Allow "TwoFactor Nextcloud Notifications" to pull the state of the 2FA againJoas Schilling2021-10-072-0/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #29384 from nextcloud/backport/26725/stable21John Molakvoæ2021-11-035-5/+17
|\ \ \ \ \
| * | | | | Hide "federated" scope when Federation app is disabledDaniel Calviño Sánchez2021-10-224-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the Federation app is disabled it is not possible to synchronize the users from a different server. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Fix "Federated" scope not shown when the lookup server is disabledDaniel Calviño Sánchez2021-10-222-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the lookup server is disabled the address books can still be exchanged between trusted servers. Therefore the user should be able to set the "Federated" scope in that case. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add missing scope to testDaniel Calviño Sánchez2021-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2021-11-0342-152/+370
| |_|_|_|/ |/| | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2021-11-02104-512/+640
| |_|/ / |/| | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | [tx-robot] updated from transifexNextcloud bot2021-11-0114-4/+262
| | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | [tx-robot] updated from transifexNextcloud bot2021-10-312-2/+12
| | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #29493 from ↵dependabot[bot]2021-10-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | nextcloud/dependabot/composer/build/integration/stable21/guzzlehttp/guzzle-6.5.5
| * | | | Update guzzlehttp/guzzle requirement in /build/integrationdependabot[bot]2021-10-301-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) to permit the latest version. - [Release notes](https://github.com/guzzle/guzzle/releases) - [Changelog](https://github.com/guzzle/guzzle/blob/6.5.5/CHANGELOG.md) - [Commits](https://github.com/guzzle/guzzle/compare/6.5.2...6.5.5) --- updated-dependencies: - dependency-name: guzzlehttp/guzzle dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #29492 from ↵dependabot[bot]2021-10-306-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/stable21/bootstrap-4.6.1
| * | | | Bump bootstrap from 4.6.0 to 4.6.1dependabot[bot]2021-10-306-8/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.6.0 to 4.6.1. - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](https://github.com/twbs/bootstrap/compare/v4.6.0...v4.6.1) --- updated-dependencies: - dependency-name: bootstrap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | [tx-robot] updated from transifexNextcloud bot2021-10-302-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #29416 from nextcloud/backport/27440/stable21MichaIng2021-10-302-6/+6
|\ \ \ \ | | | | | | | | | | [stable21] Handle files with `is_file` instead of `file_exists`
| * | | | Update Testsacsfer2021-10-231-1/+1
| | | | |
| * | | | Tests updateacsfer2021-10-231-1/+1
| | | | |
| * | | | Handle files with is_file instead of file_existsacsfer2021-10-231-4/+4
| | | | | | | | | | | | | | | Should fix things like `fread(): read of 8192 bytes failed with errno=21 Is a directory`
* | | | | [tx-robot] updated from transifexNextcloud bot2021-10-294-0/+120
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #29476 from nextcloud/backport/29115/stable21Carl Schwan2021-10-282-1/+9
|\ \ \ \ \ | | | | | | | | | | | | [stable21] Fix permissions when copying from ObjectStorage
| * | | | | Fix permissions when copying from ObjectStorageCarl Schwan2021-10-282-1/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that when a user copy a file from a directory they don't have all permissions to a directory where they have more permissions, the permissions are correctly set to the one from the parent taget folder. This was caused by the ObjectStoreStorage::copyFromStorage using the jailed storage and cache entry instead of the unjailed one like other storages (the local one). Steps to reproduce + Use object storage + Create a groupfolder with one group having full permission and another one who can just read files. + With an user who is in the second group, copy a file from the groupfolder to the home folder of this user. + The file in the home folder of the user will be read only and can't be deleted even though it is in their home folder and they are the owner. In oc_filecache, the permissions stored for this file are 1 (READ) Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | | | | Merge pull request #29458 from nextcloud/backport/29454/stable21Julius Härtl2021-10-281-1/+1
|\ \ \ \ \
| * | | | | Detect mimetype by content only with contentJoas Schilling2021-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2021-10-282-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | Merge pull request #29447 from nextcloud/backport/29220/stable21John Molakvoæ2021-10-277-146/+376
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | ciRobin Appelman2021-10-264-6/+117
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | cache versioning enabled statusRobin Appelman2021-10-261-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | minor directory detect improvementsRobin Appelman2021-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | more reliable return value for Watcher::checkUpdateRobin Appelman2021-10-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | always set Key field in `headObject`Robin Appelman2021-10-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | more reliable hasUpdated for s3Robin Appelman2021-10-261-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | remove old migration methodRobin Appelman2021-10-261-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | optimize filetype for s3 directories a bitRobin Appelman2021-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | more reliable directory copyRobin Appelman2021-10-261-20/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | doesDirectoryExist fixesRobin Appelman2021-10-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | s3 external storage listing reworkRobin Appelman2021-10-263-97/+216
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2021-10-2710-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>