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.

Sign up for GitHub

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

Jump to bottom

No conflict dialogue in read only #6094

Merged
merged 4 commits into from
Jul 24, 2024
Merged

No conflict dialogue in read only #6094

merged 4 commits into from
Jul 24, 2024

Conversation

max-nextcloud
Copy link
Collaborator

📝 Summary

🖼️ Screenshots

Scenario 🏚️ Before 🏡 After
😎 no edits - plaintext image image
💔 actual conflict image image

🏁 Checklist

  • Code is properly formatted (npm run lint / npm run stylelint / composer run cs:check)
  • Sign-off message is added to all commits
  • Tests (unit, integration and/or end-to-end) passing and the changes are covered with tests
  • No documentation required.

@max-nextcloud
test(cy): extract createConflict function
9b2d01d 
Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud max-nextcloud mentioned this pull request Jul 24, 2024
Closed
8 tasks
@max-nextcloud
fix(listeners): clean up sessions for plaintext as well
dbf1ff7 
Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud
fix(conflict): no conflict dialogue in read only mode
3fd2093 
Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud
test(cy): use cy.getContent and more compact syntax
144b227 
Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud max-nextcloud force-pushed the fix/no-conflict-dialogue-in-read-only branch from 0330ec0 to 144b227 Compare July 24, 2024 13:09
juliusknorr
juliusknorr approved these changes Jul 24, 2024
View reviewed changes
Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 🥳

@juliusknorr juliusknorr merged commit ccc1c9f into main Jul 24, 2024
62 of 64 checks passed
@juliusknorr juliusknorr deleted the fix/no-conflict-dialogue-in-read-only branch July 24, 2024 16:26
@juliusknorr juliusknorr added bug Something isn't working backport-request labels Jul 24, 2024
@juliusknorr
Copy link
Member

@max-nextcloud please request backports where needed, can also be done when opening the pr already :)

@max-nextcloud
Copy link
Collaborator Author

/backport to stable29

@max-nextcloud
Copy link
Collaborator Author

/backport to stable28

@backportbot backportbot bot mentioned this pull request Jul 24, 2024
Merged
@backportbot backportbot bot mentioned this pull request Jul 24, 2024
Merged
@blizzz blizzz mentioned this pull request Jul 25, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliusknorr juliusknorr juliusknorr approved these changes

@mejo- mejo- Awaiting requested review from mejo- mejo- is a code owner

Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: Read only shared text file is not up-to-date with saved file
2 participants
@max-nextcloud @juliusknorr