aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* chore: update psalm baselinebackport/48466/stable29Daniel Kesselberg2024-10-302-805/+1131
| | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* chore: update psalmDaniel Kesselberg2024-10-301-212/+312
| | | | | | To ensure we have a stable baseline Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* ci: fail psalm when baseline update requiredDaniel Kesselberg2024-10-302-5/+2
| | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Merge pull request #49006 from nextcloud/backport/48992/stable29yemkareems2024-10-302-12/+21
|\ | | | | [stable29] fix: add PasswordConfirmationRequired to saveGlobalCredentials
| * fix: resolve conflict add PasswordConfirmationRequired to saveGlobalCredentialsbackport/48992/stable29yemkareems2024-10-301-2/+4
| | | | | | | | Signed-off-by: yemkareems <yemkareems@gmail.com>
| * fix: add PasswordConfirmationRequired to saveGlobalCredentialsyemkareems2024-10-301-10/+17
| | | | | | | | | | | | | | | | Co-authored-by: yemkareems <yemkareems@gmail.com> Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de> [skip ci]
* | Merge pull request #48700 from nextcloud/fix/cachebuster-stable30Ferdinand Thiessen2024-10-302-73/+66
|\ \ | |/ |/| [stable29] fix: Shipped apps should include the Nextcloud version in the cache buster
| * fix: Shipped apps should include the Nextcloud version in the cache busterfix/cachebuster-stable30Ferdinand Thiessen2024-10-302-73/+66
| | | | | | | | | | | | Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de> Co-authored-by: Kate <26026535+provokateurin@users.noreply.github.com> Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
* | Merge pull request #48745 from nextcloud/backport/46124/stable29Benjamin Gaussorgues2024-10-301-3/+5
|\ \ | |/ |/|
| * refactor: Inject IRootFolderbackport/46124/stable29Christopher Ng2024-10-281-4/+4
| | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * fix: Fix "Unknown path" error when source user `files` folder has not been ↵Christopher Ng2024-10-281-0/+2
| | | | | | | | | | | | initialized Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | Merge pull request #48473 from nextcloud/backport/47846/stable29Benjamin Gaussorgues2024-10-303-30/+30
|\ \
| * | fix: provision api's status codesbackport/47846/stable29Hamza Mahjoubi2024-10-093-30/+30
| | | | | | | | | | | | Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
* | | Merge pull request #48488 from nextcloud/backport/48235/stable29Benjamin Gaussorgues2024-10-307-40/+231
|\ \ \
| * | | fix: improve moving object store items to trashbinbackport/48235/stable29Robin Appelman2024-10-091-11/+8
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | fix: rework move into object store to better preserve fileidsRobin Appelman2024-10-091-19/+58
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | test: fix share storage move test with object storeRobin Appelman2024-10-091-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | fix: preserve fileid when moving from objectstore to non-objectstoreRobin Appelman2024-10-093-11/+28
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | fix: ensure source folder is removed from cache when moving to objectstoreRobin Appelman2024-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | otherwise this causes confusion down the line as it's contents will be moved to the new cache Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | test: re-add object store primary storage phpunit testsRobin Appelman2024-10-092-0/+136
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #48980 from nextcloud/backport/48632/stable29Benjamin Gaussorgues2024-10-303-3/+8
|\ \ \
| * | | fix(files): Do not jump to top when fileId is set to currentFolderbackport/48632/stable29Louis Chemineau2024-10-293-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://github.com/nextcloud/server/issues/48545 Signed-off-by: Louis Chemineau <louis@chmn.me> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | Fix(l10n): Update translations from TransifexNextcloud bot2024-10-30430-3484/+4320
| | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #48968 from nextcloud/backport/47847/stable29Kate2024-10-292-2/+29
|\ \ \ \
| * | | | test: add test for nested jail cross-storage movebackport/47847/stable29Robin Appelman2024-10-291-0/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | fix: Fix copying or moving from shared groupfoldersDaniel Calviño Sánchez2024-10-291-2/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When copying or moving between two local storages the source path (on disk) to copy or move from is got from the unjailed path of the source storage. However, if the source storage has more than one jail getting the unjailed path resolves the most external jail, but the source path needs to be got from the most internal jail instead (the one closer to the local storage). This can happen, for example, with a shared groupfolder: in that case there is an external jail for the shared storage, and one internal jail for the groupfolder storage wrapped by the shared storage. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #48973 from nextcloud/backport/48788/stable29Louis2024-10-293-2/+9
|\ \ \ \ | |/ / / |/| | | [stable29] fix: add PasswordConfirmationRequired to the external storages mentioned in review
| * | | fix: conflicts resolved by adding PasswordConfirmationRequired to update methodbackport/48788/stable29yemkareems2024-10-291-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: yemkareems <yemkareems@gmail.com>
| * | | fix: cs fix namespaceyemkareems2024-10-290-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: yemkareems <yemkareems@gmail.com>
| * | | fix: add PasswordConfirmationRequired to the eternal storages mentioned in ↵yemkareems2024-10-292-0/+5
|/ / / | | | | | | | | | | | | | | | review Signed-off-by: yemkareems <yemkareems@gmail.com>
* | | Merge pull request #48570 from nextcloud/backport/48532/stable29Kate2024-10-291-6/+0
|\ \ \
| * | | fix: do not reduce count for subadmins if they are members of groupbackport/48532/stable29Maksim Sukharev2024-10-041-6/+0
| | | | | | | | | | | | | | | | Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
* | | | Merge pull request #48958 from nextcloud/backport/48921/stable29John Molakvoæ2024-10-291-3/+3
|\ \ \ \
| * | | | ci(psalm): Add missing imagick extensionbackport/48921/stable29provokateurin2024-10-291-3/+3
|/ / / / | | | | | | | | | | | | Signed-off-by: provokateurin <kate@provokateurin.de>
* | | | Merge pull request #48889 from nextcloud/backport/48887/stable29Kate2024-10-295-13/+58
|\ \ \ \
| * | | | chore(assets): Recompile assetsbackport/48887/stable29nextcloud-command2024-10-293-8/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
| * | | | fix(files_sharing): federated shares avatarskjnldsv2024-10-292-5/+55
| | | | | | | | | | | | | | | | | | | | Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
* | | | | Merge pull request #48934 from nextcloud/backport/48625/stable29John Molakvoæ2024-10-2919-91/+103
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | chore(assets): Recompile assetsbackport/48625/stable29Grigorii K. Shartsev2024-10-2815-40/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
| * | | | refactor(files): migrate to @nextcloud/sharingGrigorii K. Shartsev2024-10-282-21/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
| * | | | fix(files): handle empty view with errorGrigorii K. Shartsev2024-10-282-17/+77
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
| * | | | chore(files): migrate davUtils to TSGrigorii K. Shartsev2024-10-283-32/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
* | | | | Fix(l10n): Update translations from TransifexNextcloud bot2024-10-2998-96/+4
|/ / / / | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #48949 from nextcloud/backport/48947/stable29Joas Schilling2024-10-282-0/+10
|\ \ \ \ | | | | | | | | | | [stable29] fix(config): Mark more configs as sensitive
| * | | | fix(config): Mark more configs as sensitivebackport/48947/stable29Joas Schilling2024-10-282-0/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #48940 from nextcloud/backport/48915/stable29yemkareems2024-10-283-6/+34
|\ \ \ \ \ | |/ / / / |/| | | | [stable29] fix: encrypt and store password, decrypt and retrieve the same
| * | | | fix: readonly removedbackport/48915/stable29yemkareems2024-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: yemkareems <yemkareems@gmail.com>
| * | | | fix: crypto added manually as expectedyemkareems2024-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: yemkareems <yemkareems@gmail.com>
| * | | | fix: crypto made inline for constructor and decrypt error handled in exceptionyemkareems2024-10-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: yemkareems <yemkareems@gmail.com> [skip ci]
| * | | | fix: crypto made inline for constructor and decrypt error handled in exceptionyemkareems2024-10-281-6/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: yemkareems <yemkareems@gmail.com>