Skip to content
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

Merged
merged 4 commits into from
Apr 23, 2024

Conversation

claucambra
Copy link
Collaborator

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

@claucambra claucambra self-assigned this Mar 27, 2024
@claucambra
Copy link
Collaborator Author

/backport to stable-3.12

@claucambra
Copy link
Collaborator Author

/backport to stable-3.13

@claucambra claucambra added this to the 3.13.0 milestone Apr 17, 2024
@camilasan camilasan force-pushed the bugfix/pause-all-tray-fix branch from 1930cf4 to 4709962 Compare April 23, 2024 16:37
@camilasan camilasan enabled auto-merge (rebase) April 23, 2024 16:42
@camilasan camilasan disabled auto-merge April 23, 2024 17:09
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>
@camilasan camilasan force-pushed the bugfix/pause-all-tray-fix branch from 4709962 to d659814 Compare April 23, 2024 17:15
@camilasan camilasan merged commit 64b7282 into master Apr 23, 2024
9 of 12 checks passed
@camilasan camilasan deleted the bugfix/pause-all-tray-fix branch April 23, 2024 17:15
Copy link

backportbot bot commented Apr 23, 2024

The backport to stable-3.13 failed. Please do this backport manually.

# 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
fatal: cherry-pick failed


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Copy link

backportbot bot commented Apr 23, 2024

The backport to stable-3.12 failed. Please do this backport manually.

# 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:
src/gui/macOS/ClientCommunicationProtocol.h
Please commit your changes or stash them before you switch branches.
Aborting


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@camilasan
Copy link
Member

/backport to stable-3.13

Copy link

backportbot bot commented Apr 23, 2024

The backport to stable-3.13 failed. Please do this backport manually.

# 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
fatal: cherry-pick failed


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6588-d659814ed6dc30524800eabdcef959361e42f1d0-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

Copy link

sonarcloud bot commented Apr 23, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
0.0% Coverage on New Code (required ≥ 80%)
D Maintainability Rating on New Code (required ≥ A)
6 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants