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] Enhancement: Implement Copy/Move Conflict Dialog #6994

Merged
merged 7 commits into from
Jun 3, 2022
Merged

[full-ci] Enhancement: Implement Copy/Move Conflict Dialog #6994

merged 7 commits into from
Jun 3, 2022

Commits on Jun 2, 2022

  1. WIP

    @lookacat @pascalwengerter
    lookacat authored and pascalwengerter committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    58b0f92 View commit details
    Browse the repository at this point in the history

  2. Make basic conflict resolving possible / Refactor drag & drop logic

    @lookacat @pascalwengerter
    lookacat authored and pascalwengerter committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    f96eb13 View commit details
    Browse the repository at this point in the history

  3. Add merge / replace button

    @lookacat @pascalwengerter
    lookacat authored and pascalwengerter committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    2661d7c View commit details
    Browse the repository at this point in the history

  4. Implement keep both button 

    Add translations, fix minor issues

Bump SDK

Remove "merge" folders

Add changelog, Bump ODS

Fix yarn.lock

Fix existing unittests

Add new unittests

Bump ODS

Set list files request depth to 1

Update changelog, Remove checkbox for single conflict
    @lookacat @pascalwengerter
    lookacat authored and pascalwengerter committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    12b6c2f View commit details
    Browse the repository at this point in the history

  5. Rebase, bump minor deps, add changelog entry for SDK bump

    @pascalwengerter
    pascalwengerter committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    d187d8b View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2022

  1. Use ngettext for success message

    @lookacat
    lookacat committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    6031f0b View commit details
    Browse the repository at this point in the history

  2. Fix Subfolder conflict wrong path

    @lookacat
    lookacat committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    85ff162 View commit details
    Browse the repository at this point in the history