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

[full-ci] Improve UX of the conflict dialog #7983

Merged
merged 6 commits into from
Nov 25, 2022
Merged

[full-ci] Improve UX of the conflict dialog #7983

merged 6 commits into from
Nov 25, 2022

Conversation

JammingBen
Copy link
Contributor

@JammingBen JammingBen commented Nov 16, 2022 •
edited
Loading

Description

The UX of the conflict dialog has been improved slightly:

  • The name of the conflicting resource is now written in quotes
  • The title of the dialog now tells the difference between files and folders
  • The "Skip"-dialog now tells the difference between files and folders

Related Issue

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

@JammingBen JammingBen self-assigned this Nov 16, 2022
@ownclouders
Copy link
Contributor

ownclouders commented Nov 16, 2022 •
edited
Loading

Results for oC10Files4 https://drone.owncloud.com/owncloud/web/29991/20/1

💥 The acceptance tests failed on retry. Please find the screenshots inside ...

webUIFilesCopy-copy_feature-L28.png

webUIFilesCopy-copy_feature-L28.png

@JammingBen JammingBen force-pushed the improve-conflict-dialog-ux branch from f7dc9ee to dc9aaf8 Compare November 18, 2022 11:04
@JammingBen JammingBen changed the title Improve UX of the conflict dialog [full-ci] Improve UX of the conflict dialog Nov 18, 2022
@JammingBen JammingBen force-pushed the improve-conflict-dialog-ux branch from 8ab7798 to 938b7de Compare November 18, 2022 12:15
@JammingBen JammingBen marked this pull request as ready for review November 18, 2022 13:22
@JammingBen JammingBen added the Status:Needs-Review Needs review from a maintainer label Nov 21, 2022
@JammingBen JammingBen force-pushed the improve-conflict-dialog-ux branch from cca5356 to f9058b9 Compare November 25, 2022 13:34
@sonarcloud
Copy link

sonarcloud bot commented Nov 25, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

80.5% 80.5% Coverage
0.0% 0.0% Duplication

@JammingBen JammingBen merged commit 75729e9 into master Nov 25, 2022
@delete-merged-branch delete-merged-branch bot deleted the improve-conflict-dialog-ux branch November 25, 2022 14:42
@micbar micbar mentioned this pull request May 3, 2023
Closed
89 tasks
@ScharfViktor ScharfViktor mentioned this pull request May 4, 2023
Closed
86 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dschmidt dschmidt dschmidt approved these changes

@AlexAndBear AlexAndBear Awaiting requested review from AlexAndBear

@lookacat lookacat Awaiting requested review from lookacat

@kulmann kulmann Awaiting requested review from kulmann

Assignees

@JammingBen JammingBen

Labels
Status:Needs-Review Needs review from a maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Upload conflict handling UI glitches
3 participants
@JammingBen @ownclouders @dschmidt