aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #48933 from ↵Joas Schilling2024-11-052-1/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | nextcloud/clear-pending-two-factor-tokens-also-from-configuration Clear pending two factor tokens also from configuration
| * | | | | fix: Handle exception when clearing previously removed two factor tokensclear-pending-two-factor-tokens-also-from-configurationDaniel Calviño Sánchez2024-11-052-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a token was already removed from the database but not from the configuration clearing the tokens will try to remove it again from the database, which caused a DoesNotExistException to be thrown. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | fix: Clear pending two factor tokens also from configurationDaniel Calviño Sánchez2024-11-052-0/+28
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise as the tokens were removed from the database but not from the configuration the next time that the tokens were cleared the previous tokens were still got from the configuration, and trying to remove them again from the database ended in a DoesNotExistException being thrown. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #48792 from nextcloud/chore/update_mysql_setup_check_i18nBenjamin Gaussorgues2024-11-051-4/+2
|\ \ \ \ \
| * | | | | chore(setupchecks): update translation for MySQL row format checkchore/update_mysql_setup_check_i18nBenjamin Gaussorgues2024-10-301-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
* | | | | | Fix(l10n): Update translations from TransifexNextcloud bot2024-11-0556-104/+90
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | Merge pull request #48621 from nextcloud/feat/issue-3786-allow-shared-calendarsSebastian Krupinski2024-11-041-9/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | feat: Allow shared calendars as appointment conflict calendars
| * \ \ \ \ \ Merge branch 'master' into feat/issue-3786-allow-shared-calendarsfeat/issue-3786-allow-shared-calendarsSebastian Krupinski2024-11-04865-5682/+19018
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #49072 from nextcloud/backport/49057/masterJoas Schilling2024-11-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | chore: Update code owners
| * | | | | | | chore: Fix maintainer of federation appbackport/49057/masterJoas Schilling2024-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #49075 from ↵Joas Schilling2024-11-041-4/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-oauth2-owncloud-migration fix(owncloud): Fix ownCloud migration with oauth2 app
| * | | | | | | | fix(owncloud): Fix ownCloud migration with oauth2 appbugfix/noid/fix-oauth2-owncloud-migrationJoas Schilling2024-11-041-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | Merge pull request #48737 from nextcloud/fix/broken-event-notificationsJoas Schilling2024-11-041-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | fix(caldav): broken activity rich objects
| * | | | | | | | fix(caldav): broken activity rich objectsfix/broken-event-notificationsAnna Larch2024-10-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Anna Larch <anna@nextcloud.com>
* | | | | | | | | Merge pull request #49051 from nextcloud/rakekniven-patch-1Daniel2024-11-041-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | chore(i18n): Fix grammar
| * | | | | | | | chore(i18n): Fix grammarrakekniven2024-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported at Transifex Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
* | | | | | | | | Merge pull request #49065 from nextcloud/enh/noid/update-o.c.u-wordingSimon L.2024-11-041-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | docs: update overwrite.cli.url wording
| * | | | | | | | | docs: update overwrite.cli.url wordingenh/noid/update-o.c.u-wordingSimon L.2024-11-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L. <szaimen@e.mail.de>
* | | | | | | | | | Merge pull request #48723 from nextcloud/fix/caldav/event-reader-durationRichard Steinmetz2024-11-041-6/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fix(caldav): duration handling in the event reader class
| * | | | | | | | | | fix(caldav): duration handling in the event reader classfix/caldav/event-reader-durationRichard Steinmetz2024-10-161-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
* | | | | | | | | | | Merge pull request #47425 from ↵Côme Chilliet2024-11-043-13/+285
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/avoid-invalid-share-on-transfer-ownership fix: promote re-shares when deleting the parent share
| * | | | | | | | | | fix: Use getRelativePath method to check if node is inside folderfix/avoid-invalid-share-on-transfer-ownershipCôme Chilliet2024-10-142-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | | fix: Fix promotion of reshares from subsubfoldersCôme Chilliet2024-10-142-25/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | | fix(tests): Revert changes to tests now that reshares are not deleted but ↵Côme Chilliet2024-10-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | promoted Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | | fix(tests): Fix share tests to test new reshare promotion systemCôme Chilliet2024-10-141-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | | chore: Add comment to make code clearerCôme Chilliet2024-10-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | | chore: Turn method description into phpdocCôme Chilliet2024-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de> Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
| * | | | | | | | | | fix(shares): Promote reshares into direct shares when share is deletedCôme Chilliet2024-10-141-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | | fix: Transfer incomming shares first, do not delete non-migratable onesCôme Chilliet2024-10-141-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canceling the previous add of deletion of invalid shares in transferownership because in some cases it deletes valid reshares, if incoming shares are not transfered on purpose. Inverting the order of transfer between incoming and outgoing so that reshare can be migrated when incoming shares are transfered. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | | fix: Tidy up code for reshare deletionCôme Chilliet2024-10-142-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | | | | | fix: delete re-shares when deleting the parent shareLuka Trovic2024-10-144-4/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: Removed part about fix command from original PR Signed-off-by: Luka Trovic <luka@nextcloud.com> Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | | | | | | | Merge pull request #49053 from nextcloud/fix/noid/update-codeowners-nfebeJoas Schilling2024-11-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | chore: Change Fenn-CS to nfebe
| * | | | | | | | | | | chore: Change Fenn-CS to nfebefix/noid/update-codeowners-nfebeMarcel Müller2024-11-031-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>
* / | | | | | | | | | Fix(l10n): Update translations from TransifexNextcloud bot2024-11-04120-488/+9040
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | | Fix(l10n): Update translations from TransifexNextcloud bot2024-11-0318-18/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | | Fix(l10n): Update translations from TransifexNextcloud bot2024-11-028-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | | Fix(l10n): Update translations from TransifexNextcloud bot2024-11-0164-172/+392
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | Merge pull request #49009 from nextcloud/fix/noid/set-ext-pwd-as-sensitiveKate2024-10-311-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix(files-external): set password as sensitivefix/noid/set-ext-pwd-as-sensitiveMaxence Lange2024-10-311-0/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | | | | | Fix(l10n): Update translations from TransifexNextcloud bot2024-10-31104-102/+396
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | Merge pull request #49000 from ↵Joas Schilling2024-10-301-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/giggsey/libphonenumber-for-php-lite-8.13.48 build(deps): Bump giggsey/libphonenumber-for-php-lite from 8.13.45 to 8.13.48
| * | | | | | | | | build(deps): Bump giggsey/libphonenumber-for-php-lite from 8.13.45 to 8.13.48dependabot/composer/giggsey/libphonenumber-for-php-lite-8.13.48Joas Schilling2024-10-301-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | Merge pull request #49023 from nextcloud/new-juliusJoas Schilling2024-10-301-4/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | chore: rename julius
| * | | | | | | | | chore: rename juliusnew-juliusDaniel Kesselberg2024-10-301-4/+4
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | | Merge pull request #49017 from nextcloud/fix/48415/do-not-rename-main-share-linkF. E Noel Nfebe2024-10-309-8/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | fix(ShareEntryLinkList): Append new links to the end of list
| * | | | | | | | chore(assets): Recompile assetsfix/48415/do-not-rename-main-share-linknextcloud-command2024-10-308-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
| * | | | | | | | fix(ShareEntryLinkList): Append new links to the end of listfenn-cs2024-10-301-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently new shares are added to beginning of the share list in the UI messing up the ordering with the original (first) looking like the most recent and the most recent looking like the original share. This error disappears on refresh. Resolves : https://github.com/nextcloud/server/issues/48415 Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
* | | | | | | | Merge pull request #48989 from ↵Joas Schilling2024-10-301-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/aws/aws-sdk-php-3.324.13 build(deps): Bump aws/aws-sdk-php from 3.311.2 to 3.324.13 for PHP 8.4 compat
| * | | | | | | | build(deps): Bump aws/aws-sdk-php from 3.311.2 to 3.324.13dependabot/composer/aws/aws-sdk-php-3.324.13Joas Schilling2024-10-301-0/+0
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #48991 from nextcloud/fix/password-field-sharingFerdinand Thiessen2024-10-309-10/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix(files_sharing): Password field must not be required if already set
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-25 07:13:30 +0000