summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bump last version digit for rebuildv20.0.14Arthur Schiwon2021-11-111-1/+1
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #29669 from nextcloud/backport/29664/stable20blizzz2021-11-112-2/+2
|\ | | | | [stable20] Fix updating with apps
| * Fix updating with appsJoas Schilling2021-11-112-2/+2
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2021-11-1170-38/+200
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* Merge pull request #29627 from nextcloud/version/20.0.14/finalblizzz2021-11-101-2/+2
|\ | | | | 20.0.14
| * 20.0.14Arthur Schiwon2021-11-101-2/+2
|/ | | | 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>
* [tx-robot] updated from transifexNextcloud bot2021-11-092-0/+2
| | | | Signed-off-by: Nextcloud bot <bot@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 #29548 from nextcloud/backposkjnldsv/update-psalm-baseline-20John Molakvoæ2021-11-041-18/+28
|\
| * Add branch-suffix to update-psalm-baseline PR creationJohn Molakvoæ2021-11-041-0/+2
| | | | | | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
| * [stable20] Update update-psalm-baseline workflowJohn Molakvoæ2021-11-041-18/+26
|/ | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
* Merge pull request #29540 from nextcloud/version/20.0.14/rc1v20.0.14rc1John Molakvoæ2021-11-041-2/+2
|\
| * 20.0.14 RC1Arthur Schiwon2021-11-031-2/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #29290 from nextcloud/backport/28768/stable20John Molakvoæ2021-11-041-1/+1
|\ \
| * | Simplify :)acsfer2021-10-211-1/+1
| | |
| * | Replace `file_exists()` method by `is_file()`acsfer2021-10-211-1/+1
| | |
| * | Get `filesize()` if `file_exists()`acsfer2021-10-211-1/+1
| | | | | | | | | Should make sense.
* | | Merge pull request #29505 from nextcloud/backport/29465/stable20John 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 #29417 from nextcloud/backport/27440/stable20John Molakvoæ2021-11-042-6/+6
|\ \ \ \
| * | | | Update Testsacsfer2021-10-301-1/+1
| | | | |
| * | | | Tests updateacsfer2021-10-301-1/+1
| | | | |
| * | | | Handle files with is_file instead of file_existsacsfer2021-10-301-4/+4
| | | | | | | | | | | | | | | Should fix things like `fread(): read of 8192 bytes failed with errno=21 Is a directory`
* | | | | Merge pull request #29314 from nextcloud/backport/29180/stable20John Molakvoæ2021-11-0412-102/+178
|\ \ \ \ \
| * | | | | Fix Access constructor callCôme Chilliet2021-10-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | Use Psr\Log\LoggerInterface where it can easily be used in user_ldapCôme Chilliet2021-10-294-63/+105
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | Fix two mistakes in previous migration to LoggerInterface in ↵Côme Chilliet2021-10-292-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OCA\User_LDAP\Access Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | Use Psr\Log\LoggerInterface in OCA\User_LDAP\AccessCôme Chilliet2021-10-296-37/+65
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | Avoid PHP errors when the LDAP attribute is not foundCôme Chilliet2021-10-291-1/+5
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | Merge pull request #29095 from nextcloud/backport/29075/stable20John Molakvoæ2021-11-041-1/+1
|\ \ \ \ \
| * | | | | Fix path of file_get_contentsacsfer2021-10-061-1/+1
| | | | | |
* | | | | | Merge pull request #29072 from nextcloud/backport/29056/stable20John Molakvoæ2021-11-042-0/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Allow "TwoFactor Nextcloud Notifications" to pull the state of the 2FA againJoas Schilling2021-10-042-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.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>
* | | | | [tx-robot] updated from transifexNextcloud bot2021-10-302-0/+6
| |_|/ / |/| | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | [tx-robot] updated from transifexNextcloud bot2021-10-294-0/+120
| | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #29457 from nextcloud/backport/29454/stable20Julius 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 #26630 from nextcloud/backport/25189/stable20John Molakvoæ2021-10-274-0/+135
|\ \ \ \
| * | | | cast intsRobin Appelman2021-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | handle the cache where a cache entry with the correct path has already been ↵Robin Appelman2021-10-191-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recreated Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | also repair storage idRobin Appelman2021-10-191-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>