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

Bugfix. Conflict dialog for multiple files. Fix checkbox border colors for dark mode on Windows. #6696

Merged
merged 1 commit into from
Apr 25, 2024

Conversation

allexzander
Copy link
Contributor

No description provided.

@allexzander allexzander changed the title Bugfix. Conflict dialog for multiple files. Fix checkbox border colos for dark mode on Windows. Bugfix. Conflict dialog for multiple files. Fix checkbox border colors for dark mode on Windows. Apr 24, 2024
@allexzander
Copy link
Contributor Author

/backport to stable-3.13

@allexzander
Copy link
Contributor Author

/backport to stable-3.12

@mgallien mgallien force-pushed the bugfix/conflictdialog-multiple-darkmode branch from 0052e8f to 2ea6d3f Compare April 25, 2024 08:14
@mgallien mgallien merged commit 59fc619 into master Apr 25, 2024
9 of 12 checks passed
@mgallien mgallien deleted the bugfix/conflictdialog-multiple-darkmode branch April 25, 2024 08:14
Copy link

backportbot bot commented Apr 25, 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/6696/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 2ea6d3fd

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6696/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.

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6696-2ea6d3fd3887260e228895ee8b9f0bf3039d9e32-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 25, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

allexzander pushed a commit that referenced this pull request Apr 25, 2024
…e-darkmode

Bugfix. Conflict dialog for multiple files. Fix checkbox border colors for dark mode on Windows.
memurats pushed a commit to nextmcloud/desktop that referenced this pull request Jun 20, 2024
…g-multiple-darkmode

Bugfix. Conflict dialog for multiple files. Fix checkbox border colors for dark mode on Windows.
memurats pushed a commit to nextmcloud/desktop that referenced this pull request Jun 20, 2024
…g-multiple-darkmode

Bugfix. Conflict dialog for multiple files. Fix checkbox border colors for dark mode on Windows.
memurats pushed a commit to nextmcloud/desktop that referenced this pull request Jun 21, 2024
…g-multiple-darkmode

Bugfix. Conflict dialog for multiple files. Fix checkbox border colors for dark mode on Windows.
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