-
Notifications
You must be signed in to change notification settings - Fork 801
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix "Pause sync for all" / "Resume sync for all" state when manipulating folder sync outside of tray #6588
Conversation
/backport to stable-3.12 |
/backport to stable-3.13 |
1930cf4
to
4709962
Compare
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
…relevant Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
4709962
to
d659814
Compare
The backport to # Switch to the target branch and update it
git checkout stable-3.13
git pull origin stable-3.13
# Create the new backport branch
git checkout -b backport/6588/stable-3.13
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 0256eaf7 ef37bf93 c40b2a24 d659814e
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6588/stable-3.13 Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
The backport to # Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12
# Create the new backport branch
git checkout -b backport/6588/stable-3.12
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 0256eaf7 ef37bf93 c40b2a24 d659814e
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6588/stable-3.12 Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout: Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
/backport to stable-3.13 |
The backport to # Switch to the target branch and update it
git checkout stable-3.13
git pull origin stable-3.13
# Create the new backport branch
git checkout -b backport/6588/stable-3.13
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 0256eaf7 ef37bf93 c40b2a24 d659814e
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6588/stable-3.13 Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
AppImage file: nextcloud-PR-6588-d659814ed6dc30524800eabdcef959361e42f1d0-x86_64.AppImage |
Quality Gate failedFailed conditions See analysis details on SonarCloud Catch issues before they fail your Quality Gate with our IDE extension SonarLint |
This fixes incongruencies between the button's text and the actual current overall sync pause status when modifying folder sync states from, for instance, the settings window