summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #31215 from nextcloud/smb-directory-invalid-typeRobin Appelman2022-03-171-9/+17
|\ | | | | handle invalid type when listing directory in smb
| * type hint as generatorRobin Appelman2022-03-041-9/+14
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * handle invilid type when listing directory in smbRobin Appelman2022-03-041-0/+3
| | | | | | | | | | | | just handle it as an empty directory Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #31574 from nextcloud/s3-crt-bundleRobin Appelman2022-03-173-8/+24
|\ \ | | | | | | use the nextcloud certificate bundle for s3
| * | don't try to get custom certs for s3 primary storageRobin Appelman2022-03-152-3/+10
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | return default bundle when there is an error getting the bundleRobin Appelman2022-03-141-7/+11
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | use the nextcloud certificate bundle for s3Robin Appelman2022-03-141-1/+6
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #31596 from Lucarnosky/masterLouis2022-03-171-0/+3
|\ \ \ | | | | | | | | Fix federated cloud share icons overlap in button
| * | | Changed to padding left #31596Lock Garnock2022-03-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue #30819 Fixed issue #30819 Signed-off-by: Lock Garnock <lucarnosky@gmail.com>
* | | | Merge pull request #31421 from ↵Côme Chilliet2022-03-1712-247/+189
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix/user_ldap-fix-ldap-connection-resets user_ldap fix ldap connection resets
| * | | | Set $limit as int as well in Access::count private methodCôme Chilliet2022-03-081-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | Fix unit testsCôme Chilliet2022-03-0310-44/+81
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | Fix types in OCA\User_LDAP\ConfigurationCôme Chilliet2022-03-032-59/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | Remove redundant is_array checkCôme Chilliet2022-03-031-11/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | Improve typing in user_ldap to detect problems earlyCôme Chilliet2022-03-033-93/+40
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | Fix executeRead when connection is reset because of a timeoutCôme Chilliet2022-03-031-36/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-03-1714-70/+106
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #30120 from nextcloud/enhancement/move-calendar-objectsAnna2022-03-1620-81/+266
|\ \ \ \ \ | | | | | | | | | | | | Move calendar objects between calendars
| * | | | | Move calendar objects between calendars instead of deleting and recreating themAnna Larch2022-03-1620-81/+266
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Anna Larch <anna@nextcloud.com>
* | | | | Merge pull request #31581 from nextcloud/refactor/carl/comment-appCarl Schwan2022-03-1611-154/+54
|\ \ \ \ \ | | | | | | | | | | | | Modernize comments app
| * | | | | Modernize comments appCarl Schwan2022-03-1611-154/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use php 7.4 typed properties * More typed methods (and replace existing php doc in some cases) * query -> get for Container Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | | | | | Merge pull request #31578 from nextcloud/s3-test-reliabilityCarl Schwan2022-03-161-0/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | try to improve s3 primary storage test reliability
| * | | | | try to improve s3 primary storage test reliabilityRobin Appelman2022-03-151-0/+7
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #31577 from nextcloud/fix/register-talk-brokerJoas Schilling2022-03-151-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix unknown Talk broker interface
| * | | | | Fix unknown Talk broker interfaceChristoph Wurst2022-03-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #31579 from nextcloud/nickvergessen-patch-1Joas Schilling2022-03-151-2/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Also add the column when the table already existed
| * | | | | Update Version24000Date20211222112246.phpJoas Schilling2022-03-151-2/+4
|/ / / / /
* | | | | Merge pull request #31573 from nextcloud/exceptionserializer-load-failRobin Appelman2022-03-151-1/+7
|\ \ \ \ \ | | | | | | | | | | | | don't error if we can't load the ExceptionSerializer for early exceptions
| * | | | | don't error if we can't load the ExceptionSerializer for early exceptionsRobin Appelman2022-03-141-1/+7
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #31513 from nextcloud/techdebt/noid/enforce-primary-keysJoas Schilling2022-03-152-1/+45
|\ \ \ \ \ | | | | | | | | | | | | Enforce primary keys as they are required to be performant in MySQL c…
| * | | | | Add a test for primary keysJoas Schilling2022-03-101-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Enforce primary keys as they are required to be performant in MySQL clustersJoas Schilling2022-03-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #31498 from Erikvv/s3-versioning-not-implementedLouis2022-03-151-2/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | AmazonS3: allow not implemented versioning
| * | | | | | AmazonS3: allow not implemented versioningErik van Velzen2022-03-151-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the S3 implementation does not implement versioning, set it to false. Versioning was introduced in Nexcloud in commit 09ffac5e6dd5355c9aaf49c098942fa1e4fbed25 This is needed for compatibility with the Storj gateway. Signed-off-by: Erik van Velzen <erik@evanv.nl>
* | | | | | | Merge pull request #31397 from nextcloud/fix/31237/new-button-SetStatusModalVanessa2022-03-155-15/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add new button component SetStatusModal
| * | | | | | | add new button componentVanessa Pertsch2022-03-025-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vanessa Pertsch <vanessa.pertsch@nextcloud.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | | | | Merge pull request #31378 from nextcloud/fix/31237/new-button-UserListVanessa2022-03-155-12/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use new button component UserList
| * | | | | | | | use new button componentVanessa Pertsch2022-03-145-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vanessa Pertsch <vanessa.pertsch@nextcloud.com> Signed-off-by: Vanessa Pertsch <vanessa.pertsch@posteo.com> Signed-off-by: Vanessa Pertsch <vanessa.pertsch@posteo.de> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-03-154-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | Merge pull request #31516 from nextcloud/enh/improve-user_migration-apiPytal2022-03-147-2/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Extends UserMigrationException in CalendarMigratorExceptionCôme Chilliet2022-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | Fix autoloader and phpdoc for new classCôme Chilliet2022-03-144-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | Improve wording of pathExists descriptionCôme Chilliet2022-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com> Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | | | | Add getOriginalUid in IImportSource to simplify code when importing under ↵Côme Chilliet2022-03-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another uid Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | Add pathExists method to IImportSource to test if a path exists in the archiveCôme Chilliet2022-03-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | Move UserMigrationException to OCP and add @throws documentationCôme Chilliet2022-03-142-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | | | | | | Merge pull request #31572 from nextcloud/fix/select2_settings_adminPytal2022-03-145-9/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Use global $ in settings admin.jsLouis Chemineau2022-03-145-9/+6
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://github.com/nextcloud/server/issues/31570 Signed-off-by: Louis Chemineau <louis@chmn.me> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | | | | | Merge pull request #31567 from nextcloud/update-composer-filesCarl Schwan2022-03-1423-23/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Update composer generated files to latest version
| * | | | | | | | Update composer generated files to latest versionCarl Schwan2022-03-1423-23/+23
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>