Upstream sync: 381 new commit(s) from nextcloud/desktop - #14
Merged
Merged
Conversation
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
…nge delivery acknowledgement Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Only modify change delivery state (next sequence, current anchor key, queued delivery items, deletion cleanup) once change delivery batch is confirmed acknowledged by the file provider framework Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
fix(clntenc): Do not use ENGINE_get_default_RSA
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
…callback fix: Normalisation of Windows paths during journal clean-up after recursive deletion
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
…h name comment Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Fixes nextcloud#10737 Address any missing item that is meant to be deleted (including non-trashed items) as a successful deletion Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Treat 404s on items intended for deletion as valid
Signed-off-by: Markus Goetz <markus@woboq.com>
…l directly Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
…oped bookmark Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Realm 20.0.4 does not compile on Xcode 27; need to upgrade to 20.0.5 Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
fix: sync engine readonly folder file deletion
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
fix(file-provider): Fix build on Xcode 27
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
fix(macOS): Fix clang format config for Objective-C/Objective-C++
Signed-off-by: Rello <github@scherello.de> Assisted-by: Codex:GPT-5
…ettings-dark-panels fix(settings): restore Windows panel palette roles
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
we need to store and restore the account UUID that is used to identify the synchronization folder that will enable connection again to the folder when restarting the client Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
…operties Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
…ilslistmodel Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Signed-off-by: Claudio Cambra <developer@claudiocambra.com> Assisted-by: Codex:GPT-5
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
…-windows fix(windows): Pass extended \\?\ paths to QFile for ordinary files in Filesystem::rename
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
fix(reuse): Remove unneeded xcscheme
…emplate. Previously, they listed the “General” tab. They have been transferred to the “Advanced” tab, so I have replaced it with that. Signed-off-by: Mr Beedell, Roke Julian Lockhart <5wkuhn4z@rokejulianlockhart.addy.io>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Some clients only care about the side-effect Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
…minor-change Updated Xcode Scheme Reference in Documentation
Isolated RemoteChangePropagationTests database state per test. Ran replacement enumeration off the blocked callback queue. Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
…d-sharing feat: Add support for unified sharing
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
fix: Correct the debug archive generation instructions in the bug report template.
…NoGuiBuildOption Bugfix/mgallien/fix no gui build option
…pdate-macOS-development.md Document finding Team ID for free Apple developer accounts
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
xeniacloud
added a commit
that referenced
this pull request
Sep 20, 2026
…ync-conflict Fix unresolved conflict markers left on master by PR #14
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated catch-up sync against nextcloud/desktop master. This fork was 381 commits behind — the existing
Upstream Syncworkflow (.github/workflows/upstream-sync.yml) has been failing weekly since 2026-09-14 because it aborts on conflict and fails the run rather than opening a PR (issues are disabled on this repo, so it can't file one either), and nobody has resolved it since.This merge has unresolved conflicts (committed as-is with conflict markers) in:
.github/workflows/linux-appimage.yml.github/workflows/linux-clang-compile-tests.yml.github/workflows/sonarcloud.ymladmin/linux/build-appimage.shResolve these on this branch before merging. This PR is never auto-merged - review for conflicts with branding/CI plumbing before merging.
Upstream commits (showing first 50 of 381; see the full compare)
... and 331 more.
🤖 Generated with Claude Code