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

[GSOC22] - D - Test the Three Way Merge UI #9069

Merged
merged 30 commits into from
Sep 10, 2022
Merged

[GSOC22] - D - Test the Three Way Merge UI #9069

merged 30 commits into from
Sep 10, 2022

Commits on Aug 16, 2022

  1. Rename isIsFieldsMerged to isFieldsMerged

    @HoussemNasri
    HoussemNasri committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    4d8e6c1 View commit details
    Browse the repository at this point in the history

  2. [WIP] Test FieldRowViewModel

    @HoussemNasri
    HoussemNasri committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    f86a885 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Remove FieldRowController.java

    @HoussemNasri
    HoussemNasri committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    3141a54 View commit details
    Browse the repository at this point in the history

  2. Move fields merge and unmerge logic to FieldRowViewModel for better t… 

    …estability
    @HoussemNasri
    HoussemNasri committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    f0e4597 View commit details
    Browse the repository at this point in the history

  3. Fix tests

    @HoussemNasri
    HoussemNasri committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    a678cc7 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. Test the mergeFields method

    @HoussemNasri
    HoussemNasri committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    16f4bfc View commit details
    Browse the repository at this point in the history

  2. Fix tests

    @HoussemNasri
    HoussemNasri committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    ac63524 View commit details
    Browse the repository at this point in the history

  3. Test unmergeFields method

    @HoussemNasri
    HoussemNasri committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    bb331b3 View commit details
    Browse the repository at this point in the history

  4. Add test case for mergeFields

    @HoussemNasri
    HoussemNasri committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    7426254 View commit details
    Browse the repository at this point in the history

  5. Create BibEntry instance using withField()

    @HoussemNasri
    HoussemNasri committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    bfcec1a View commit details
    Browse the repository at this point in the history

  6. Ignore missing or surplus spaces when merging groups

    @HoussemNasri
    HoussemNasri committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    fe11ee7 View commit details
    Browse the repository at this point in the history

  7. Test GroupMerger

    @HoussemNasri
    HoussemNasri committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    f67f59f View commit details
    Browse the repository at this point in the history

  8. Extract regex into a field of type Pattern

    @HoussemNasri
    HoussemNasri committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    6c5131d View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2022

  1. Improve groups splitting performance

    @HoussemNasri
    HoussemNasri committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    3452a95 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2022

  1. Delete AbstractCell.java

    @HoussemNasri
    HoussemNasri committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    511dab7 View commit details
    Browse the repository at this point in the history

  2. Rename 'NO_ROW_INDEX' to 'HEADER_ROW' 

    - Because NO_ROW_INDEX is passed to ThreeWayMergeCell for header cells only
    @HoussemNasri
    HoussemNasri committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    567c71d View commit details
    Browse the repository at this point in the history

  3. Extract logic from ThreeWayMergeCell to a view model

    @HoussemNasri
    HoussemNasri committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    19a36e5 View commit details
    Browse the repository at this point in the history

  4. Use CSS to style cell padding

    @HoussemNasri
    HoussemNasri committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    45a66aa View commit details
    Browse the repository at this point in the history

  5. Test ThreeWayMergeCellViewModel

    @HoussemNasri
    HoussemNasri committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    3ce56ea View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2022

  1. Merge remote-tracking branch 'upstream/main' into GSOC22-Test-Three-W… 

    …ay-Merge
    @HoussemNasri
    HoussemNasri committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    92aaf8e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into GSOC22-Test-Three-Way-Merge

    @HoussemNasri
    HoussemNasri committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    da7d622 View commit details
    Browse the repository at this point in the history

  3. Don't override setUserData() and getUserData() 

    - Setting user data was useful before when FieldRow depended on it to figure out the value of the selected cell, but now it has a different implementation
    @HoussemNasri
    HoussemNasri committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    a12bdd6 View commit details
    Browse the repository at this point in the history

  4. Create FieldValueCellViewModel

    @HoussemNasri
    HoussemNasri committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    d5dee77 View commit details
    Browse the repository at this point in the history

  5. Refactor OpenExternalLinkAction

    @HoussemNasri
    HoussemNasri committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    ef95c17 View commit details
    Browse the repository at this point in the history

  6. Refactor ThreeWayMergeViewModel

    @HoussemNasri
    HoussemNasri committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    6bb5092 View commit details
    Browse the repository at this point in the history

  7. Test ThreeWayMergeViewModel

    @HoussemNasri
    HoussemNasri committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    196bfd3 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. Checkstyle

    @HoussemNasri
    HoussemNasri committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    8b1982c View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2022

  1. Merge branch 'main' into GSOC22-Test-Three-Way-Merge

    @HoussemNasri
    HoussemNasri committed Sep 4, 2022
    Configuration menu
    Copy the full SHA
    b9b16b6 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2022

  1. Disable a test

    @HoussemNasri
    HoussemNasri committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    1a8e68c View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2022

  1. Update FieldRowViewModelTest.java

    @calixtus
    calixtus committed Sep 10, 2022
    Configuration menu
    Copy the full SHA
    2bc513b View commit details
    Browse the repository at this point in the history