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

Fix folder conflict dialog issues #7724

Merged
merged 2 commits into from
Sep 30, 2022
Merged

Fix folder conflict dialog issues #7724

merged 2 commits into from
Sep 30, 2022

Conversation

JammingBen
Copy link
Collaborator

@JammingBen JammingBen commented Sep 30, 2022 •
edited

Description

  • Fixed "Keep both" and "Skip" options in Firefox
  • Fixed "Keep both" and "Skip" options when uploading via the "Upload"-menu
  • Fixed broken "Upload"-menu after skipping all files (= no files uploaded)
  • Fixed issues when uploading a folder into another folder which has or starts with the same name

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

@JammingBen JammingBen self-assigned this Sep 30, 2022
@sonarcloud
Copy link

sonarcloud bot commented Sep 30, 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 0 Code Smells

88.9% 88.9% Coverage
0.0% 0.0% Duplication

@JammingBen JammingBen marked this pull request as ready for review September 30, 2022 12:30
@kulmann kulmann merged commit 83d6ee6 into master Sep 30, 2022
@delete-merged-branch delete-merged-branch bot deleted the fix-folder-conflict-dialog branch September 30, 2022 12:58
@micbar micbar mentioned this pull request Nov 25, 2022
Closed
73 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kulmann kulmann kulmann approved these changes

@AlexAndBear AlexAndBear Awaiting requested review from AlexAndBear

@lookacat lookacat Awaiting requested review from lookacat

Assignees

@JammingBen JammingBen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Conflict selection "keep both" for folders overwrites content when using Firefox
2 participants
@JammingBen @kulmann