summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2021-11-1170-38/+200
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* Merge pull request #29626 from nextcloud/version/21.0.6/finalblizzz2021-11-101-1/+1
|\ | | | | 21.0.6
| * 21.0.6Arthur Schiwon2021-11-101-1/+1
|/ | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* [tx-robot] updated from transifexNextcloud bot2021-11-1042-36/+286
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* Merge pull request #29599 from nextcloud/backport/29029/stable21Louis2021-11-093-3/+20
|\ | | | | [stable21] Fix HTML entity rendering in file comments sidebar
| * Fix HTML entity rendering in file comments sidebarChristopher Ng2021-11-093-3/+20
|/ | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* Merge pull request #29576 from ↵dependabot[bot]2021-11-0950-60/+60
|\ | | | | | | nextcloud/dependabot/npm_and_yarn/stable21/nextcloud/initial-state-1.2.1
| * Manual compilationLouis Chemineau2021-11-0948-56/+56
| | | | | | | | Signed-off-by: Louis Chemineau <louis@chmn.me>
| * Bump @nextcloud/initial-state from 1.2.0 to 1.2.1dependabot[bot]2021-11-092-4/+4
|/ | | | | | | | | | | | | | | Bumps [@nextcloud/initial-state](https://github.com/nextcloud/nextcloud-initial-state) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/nextcloud/nextcloud-initial-state/releases) - [Changelog](https://github.com/nextcloud/nextcloud-initial-state/blob/master/CHANGELOG.md) - [Commits](https://github.com/nextcloud/nextcloud-initial-state/compare/v1.2.0...v1.2.1) --- updated-dependencies: - dependency-name: "@nextcloud/initial-state" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* Merge pull request #29579 from ↵Louis2021-11-091-1/+1
|\ | | | | | | | | nextcloud/dependabot/composer/build/integration/stable21/behat/behat-approx-3.10.0 Update behat/behat requirement from ~3.9.0 to ~3.10.0 in /build/integration
| * Update behat/behat requirement in /build/integrationdependabot[bot]2021-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [behat/behat](https://github.com/Behat/Behat) to permit the latest version. - [Release notes](https://github.com/Behat/Behat/releases) - [Changelog](https://github.com/Behat/Behat/blob/master/CHANGELOG.md) - [Commits](https://github.com/Behat/Behat/compare/v3.9.0...v3.10.0) --- updated-dependencies: - dependency-name: behat/behat dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>
* | [tx-robot] updated from transifexNextcloud bot2021-11-092-0/+2
| | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | Merge pull request #29596 from nextcloud/backport/29592/stable21John Molakvoæ2021-11-082-3/+19
|\ \ | |/ |/|
| * refs #11864 handle empty dir drop in Files UIJulien Veyssier2021-11-082-3/+19
|/ | | | Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
* Merge pull request #29520 from nextcloud/backport/29479/stable21Côme Chilliet2021-11-0810-111/+38
|\ | | | | [stable21] Fix images on php 8.0
| * Merge branch 'stable21' into backport/29479/stable21Côme Chilliet2021-11-0454-200/+482
| |\ | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | Fix psalm-ocp error about GdImage classCôme Chilliet2021-11-021-0/+8
| | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | Enable Avatar tests as well for PHP>=8Côme Chilliet2021-11-021-20/+0
| | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | Revert "Do not run image tests on php8"Côme Chilliet2021-11-021-68/+0
| | | | | | | | | | | | | | | | | | This reverts commit d690f909284ae4bb4dee7d00318104ee76720bfa. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | Fix resource usages in OC_ImageCôme Chilliet2021-11-027-23/+30
| | | | | | | | | | | | | | | | | | This makes sure using resource or GdImage (PHP>=8) behaves the same. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2021-11-0814-6/+40
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2021-11-0716-2/+60
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2021-11-0660-72/+318
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2021-11-0554-152/+48
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | Merge pull request #29550 from nextcloud/backposkjnldsv/update-psalm-baseline-21John Molakvoæ2021-11-041-15/+22
|\ \ \
| * | | Add branch-suffix to update-psalm-baseline PR creationJohn Molakvoæ2021-11-041-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
| * | | [stable21] Update update-psalm-baseline workflowJohn Molakvoæ2021-11-041-15/+20
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
* | | | Merge pull request #29551 from ↵John Molakvoæ2021-11-043-40/+4
|\ \ \ \ | |/ / / |/| | | | | | | nextcloud/revert-29322-mysql-search-ignore-index-21
| * | | Revert "[21] tell mysql to ignore the sort index for search queries"John Molakvoæ2021-11-043-40/+4
|/ / /
* | | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-04 17:10:01 +0000