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.

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

[WIP] [GSOC22] Improve the external changes resolver dialog #9015

Merged
merged 267 commits into from
Aug 3, 2022
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jul 18, 2022

  1. Reworded t in pr (#8989)

    calixtus authored Jul 18, 2022
    Configuration menu
    Copy the full SHA
    be4a7c5 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2022

  1. Configuration menu
    Copy the full SHA
    76f0063 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cd41230 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2022

  1. Bump java-diff-utils from 4.11 to 4.12 (#8998)

    Bumps [java-diff-utils](https://github.com/java-diff-utils/java-diff-utils) from 4.11 to 4.12.
    - [Release notes](https://github.com/java-diff-utils/java-diff-utils/releases)
    - [Changelog](https://github.com/java-diff-utils/java-diff-utils/blob/master/CHANGELOG.md)
    - [Commits](java-diff-utils/java-diff-utils@java-diff-utils-parent-4.11...java-diff-utils-parent-4.12)
    
    ---
    updated-dependencies:
    - dependency-name: io.github.java-diff-utils:java-diff-utils
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jul 26, 2022
    Configuration menu
    Copy the full SHA
    c51a486 View commit details
    Browse the repository at this point in the history
  2. Bump libreoffice from 7.3.4 to 7.3.5 (#8997)

    Bumps libreoffice from 7.3.4 to 7.3.5.
    
    ---
    updated-dependencies:
    - dependency-name: org.libreoffice:libreoffice
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jul 26, 2022
    Configuration menu
    Copy the full SHA
    7df24b9 View commit details
    Browse the repository at this point in the history
  3. Bump unoloader from 7.3.4 to 7.3.5 (#8996)

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jul 26, 2022
    Configuration menu
    Copy the full SHA
    160b805 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8ab7635 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    36c64dc View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Configuration menu
    Copy the full SHA
    bd8ede5 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. Squashed 'buildres/csl/csl-styles/' changes from 3d3573c..c750b6e

    c750b6e APA: Put conditional event-title logic in a macro (#6161)
    a87414f Remove month from association-for-compuational-linguistics.csl (#6158)
    6153db0 Remove issue numbers from BJOC style (#6155)
    e231ea3 Bug fix for `event` regression (#6154)
    0dab651 Add event-title to other APA styles (#6153)
    698cf1c APA: `event-title` and conditional `event` (#6152)
    58d3f8f Update vancouver-author-date.csl (#6148)
    f1638a9 add substitute to Vancouver author date (#6147)
    39fede5 Update associacao-brasileira-de-normas-tecnicas.csl (#6138)
    fde7695 Include chapter title (#6140)
    1e3d8b4 Update n.d. abbreivation for DGP style (#6136)
    ebb728b suffix '.' after first group; changed e-mail (#6135)
    eed4f07 Update and rename sciences-po-ecole-doctorale-note-french.csl to scie… (#6127)
    f194647 Delete TU Dresden Medizin as requested by library (#6131)
    d8423d8 Create entomological-review.csl (#6120)
    064a394 Create australasian-journal-of-philosophy.csl (#6063)
    a998ded Add composer.json (#5668)
    37083c9 Update copernicus-publications.csl (#6062)
    694c97b Create chaucer review (#6061)
    625a424 Create haffner-style-manual.csl (#6054)
    8b7224b make annals-of-allergy-asthma-and-immunology independent (#6041)
    710748c Create university-of-pretoria-harvard-theology-religion.csl (#6106)
    d16dffd Create health-physics.csl (#6040)
    ca9e184 Update style-manual-australian-government.csl (#6119)
    e412277 Create chemical-engineering-technology.csl (#6039)
    bebdb48 Create bibliothek-forschung-und-praxis.csl (#6038)
    29e49cd Update nature.csl (#6117)
    891897d fix short title for SBL (#6118)
    
    git-subtree-dir: buildres/csl/csl-styles
    git-subtree-split: c750b6e
    github actions committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    871c8d7 View commit details
    Browse the repository at this point in the history
  2. Merge commit '871c8d749be52a96fef3900a52084359b31fcaf9'

    github actions committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    e0b94aa View commit details
    Browse the repository at this point in the history
  3. Squashed 'buildres/csl/csl-locales/' changes from 55459cd79f..e637746677

    e637746677 copied .github/workflows/merge.yaml from styles
    
    git-subtree-dir: buildres/csl/csl-locales
    git-subtree-split: e637746677fd1f600173e07b561f0388284ae39b
    github actions committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    4ee5553 View commit details
    Browse the repository at this point in the history
  4. Merge commit '4ee5553507c43af9829bb979472c8362702b1105'

    github actions committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    90fda18 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #9004 from JabRef/refresh-csl

    [Bot] Update CSL styles
    Siedlerchr authored Aug 1, 2022
    Configuration menu
    Copy the full SHA
    9d9afdc View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    277df6f View commit details
    Browse the repository at this point in the history
  7. Bump appleboy/ssh-action from 0.1.4 to 0.1.5 (#9005)

    Bumps [appleboy/ssh-action](https://github.com/appleboy/ssh-action) from 0.1.4 to 0.1.5.
    - [Release notes](https://github.com/appleboy/ssh-action/releases)
    - [Commits](appleboy/ssh-action@v0.1.4...v0.1.5)
    
    ---
    updated-dependencies:
    - dependency-name: appleboy/ssh-action
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Aug 1, 2022
    Configuration menu
    Copy the full SHA
    5338cfe View commit details
    Browse the repository at this point in the history
  8. Bump checkstyle from 10.3.1 to 10.3.2 (#9006)

    Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.3.1 to 10.3.2.
    - [Release notes](https://github.com/checkstyle/checkstyle/releases)
    - [Commits](checkstyle/checkstyle@checkstyle-10.3.1...checkstyle-10.3.2)
    
    ---
    updated-dependencies:
    - dependency-name: com.puppycrawl.tools:checkstyle
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Aug 1, 2022
    Configuration menu
    Copy the full SHA
    ffecadd View commit details
    Browse the repository at this point in the history
  9. Bump lucene-core from 9.2.0 to 9.3.0 (#9009)

    * Bump lucene-core from 9.2.0 to 9.3.0
    
    Bumps lucene-core from 9.2.0 to 9.3.0.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.lucene:lucene-core
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    * update lucence stuff
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Siedlerchr <siedlerkiller@gmail.com>
    dependabot[bot] and Siedlerchr authored Aug 1, 2022
    Configuration menu
    Copy the full SHA
    91105e5 View commit details
    Browse the repository at this point in the history
  10. Bump junit-jupiter from 5.8.2 to 5.9.0 (#9012)

    * Bump junit-jupiter from 5.8.2 to 5.9.0
    
    Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0.
    - [Release notes](https://github.com/junit-team/junit5/releases)
    - [Commits](junit-team/junit5@r5.8.2...r5.9.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.junit.jupiter:junit-jupiter
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    * remove private attribute from setup
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Siedlerchr <siedlerkiller@gmail.com>
    dependabot[bot] and Siedlerchr authored Aug 1, 2022
    Configuration menu
    Copy the full SHA
    8389254 View commit details
    Browse the repository at this point in the history
  11. Support biblatex apa citation for legal entry types (#8966)

    Co-authored-by: Siedlerchr <siedlerkiller@gmail.com>
    Ognimalf and Siedlerchr authored Aug 1, 2022
    Configuration menu
    Copy the full SHA
    02f51f7 View commit details
    Browse the repository at this point in the history
  12. Update BST VM to Antlr4 (#8934)

    * migrate to antlr4
    
    * apply ide suggestions
    
    * Refactor
    
    * Introduce BstVM, wip
    
    * read, entry, sort wip
    
    * functions visitor
    
    * bstEntryContext
    
    * function, identifier, stackitem, exception
    
    * reorder
    
    * execute, iterate, reverse
    
    * removed old vm, prepared test architecture
    
    * fixed parser
    
    * fixed stringscommand
    
    * fixed macrocommand
    
    * fixed functioncommand
    
    * added exception handling for functions
    
    * testVisitEntryCommand
    
    * testVisitReadCommand
    
    * reorder and cleanup
    
    * testdata cleanup
    
    * fix function call
    
    * fixed call.type
    
    * wip if
    
    * wip if
    
    * addedTests
    
    * finally fixed if
    
    * wip tests
    
    * stylistic issues
    
    * Reworded
    
    * Improved error logging
    
    * Fix error msg
    
    * wip
    
    * Fixed tests
    
    * Fixed tests
    
    * Removed TestVM
    
    * Added reverse test
    
    * Added visitStackitem test
    
    * Added bbl tests
    
    * clean up
    
    Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
    calixtus and koppor authored Aug 1, 2022
    Configuration menu
    Copy the full SHA
    0a1e98b View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    0d82506 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    b7a7401 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. New Crowdin updates (#9013)

    * New translations JabRef_en.properties (French)
    
    * New translations JabRef_en.properties (Russian)
    
    * New translations JabRef_en.properties (Chinese Simplified)
    
    * New translations JabRef_en.properties (Italian)
    
    * New translations JabRef_en.properties (German)
    Siedlerchr authored Aug 2, 2022
    Configuration menu
    Copy the full SHA
    baae43b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    891feb6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    feb0628 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    328ce97 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b8ce549 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    588db57 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0af8175 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0e128d2 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    0f1366a View commit details
    Browse the repository at this point in the history
  10. Populate table view with changes

    - Initialized the change name column
    - Commented out 'getDialogPane().setContent(pane)' because it will be removed later
    HoussemNasri committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    241ae86 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    b3ddc88 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    6bf045b View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    0be74a6 View commit details
    Browse the repository at this point in the history
  14. Apply changes when before the dialog

    - Changes are applied only when all changes are resolved (changes table is empty). Like a transaction
    HoussemNasri committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    5cd88eb View commit details
    Browse the repository at this point in the history
  15. Cleanup FXML

    HoussemNasri committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    fe4b582 View commit details
    Browse the repository at this point in the history
  16. Remove old UI code

    HoussemNasri committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    fc656d9 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    12ec6c5 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2022

  1. Configuration menu
    Copy the full SHA
    f9292de View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dd46057 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    57062ce View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d90c418 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ea33534 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c4274a9 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f0d8cb3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ca627bc View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    0f463db View commit details
    Browse the repository at this point in the history
  10. Merge remote-tracking branch 'upstream/main' into GSOC-improve-collab…

    …-dialog
    
    * upstream/main:
      New Crowdin updates (#9016)
    Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    3ad3a83 View commit details
    Browse the repository at this point in the history
  11. Update README.md

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    8ecf890 View commit details
    Browse the repository at this point in the history
  12. Fix Readme

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    ee988f9 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    0b9a345 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    93a17c6 View commit details
    Browse the repository at this point in the history
  15. Make FieldValueCell selectable

    - Defined style class
    - Defined pseudo class for the selected state
    - Created the selection box UI
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    2d2c1ff View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    5329e29 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    f184ed2 View commit details
    Browse the repository at this point in the history
  18. Style MergedFieldCell

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    111a211 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    e30db74 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    1c7e012 View commit details
    Browse the repository at this point in the history
  21. Fix typo

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    249bec9 View commit details
    Browse the repository at this point in the history
  22. Fix a bug that causes the selection of both left and right field cell…

    …s simultaneously.
    
    - Added a style class for field value cell
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    c12a352 View commit details
    Browse the repository at this point in the history
  23. Prevent the selection of FieldValueCell when it's disabled

    - A cell is disabled when it's either empty or not visible e.g. when the left cell spans 2 columns, right cell is disabled because it's not visible
    - Added comments
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    fa86607 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    e8fef63 View commit details
    Browse the repository at this point in the history
  25. Disable left or right FieldValueCell when it's empty

    - Added getters for row cells
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    70180f2 View commit details
    Browse the repository at this point in the history
  26. Update Base CSS style

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    d90fcf2 View commit details
    Browse the repository at this point in the history
  27. Design and implement the merge toolbox

    - It will be added to the top of the merge dialog
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    a3091c6 View commit details
    Browse the repository at this point in the history
  28. Implement the initial prototype of the new merge UI

    - Renamed ThreeWayMerge.java to ThreeWayMergeView
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    e9a410e View commit details
    Browse the repository at this point in the history
  29. Use ThreeWayMergeView in MergeEntriesDialog

    - At this stage headers aren't updated and merged bib entry is not created
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    180493d View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    f80aa41 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    819ac4e View commit details
    Browse the repository at this point in the history
  32. Wrap the copy icon inside a button

    - Updated the selection box UI
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    7f4cd2f View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    823125c View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    ca5d4f3 View commit details
    Browse the repository at this point in the history
  35. Update merge toolbox FXML UI

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    ec78eec View commit details
    Browse the repository at this point in the history
  36. Implement and style HeaderCell

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    5c093e0 View commit details
    Browse the repository at this point in the history
  37. Take row index as an argument in AbstractCell

    - Created odd and even pseudo classes that will update the background color of the cell when state changes.
    - Created NO_ROW_INDEX to be used by HeaderCell, because HeaderCell doesn't base its background color on its row position which is 0.
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    9d6a921 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    db5f3a0 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    0918e79 View commit details
    Browse the repository at this point in the history
  40. Copy field value to Clipboard user clicks on the copy button

    - Renamed copy-icon style class
    - Used ActionFactory for creating the copy icon button
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    32ad571 View commit details
    Browse the repository at this point in the history
  41. Implement a more complete HeaderView

    - Created ColumnConstraints that matches the field grid constraints, so when the window is resized grid and header resize equally
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    7ed7250 View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    0197257 View commit details
    Browse the repository at this point in the history
  43. Create merged entry

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    95ea40f View commit details
    Browse the repository at this point in the history
  44. Add the entry type field at the top of the fields list

    - Sorted fields by name
    - Removed internal fields
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    8becfc1 View commit details
    Browse the repository at this point in the history
  45. Configuration menu
    Copy the full SHA
    6042d69 View commit details
    Browse the repository at this point in the history
  46. Minor changes

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    390762b View commit details
    Browse the repository at this point in the history
  47. Style CSS

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    91dd860 View commit details
    Browse the repository at this point in the history
  48. Configuration menu
    Copy the full SHA
    32a9ffb View commit details
    Browse the repository at this point in the history
  49. Configuration menu
    Copy the full SHA
    0a5fb15 View commit details
    Browse the repository at this point in the history
  50. Create EmptyCell for optimization

    - When cell is empty there is no point of creating a label object
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    4267cf6 View commit details
    Browse the repository at this point in the history
  51. Update HeaderCell

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    ef3271c View commit details
    Browse the repository at this point in the history
  52. Configuration menu
    Copy the full SHA
    cac4f11 View commit details
    Browse the repository at this point in the history
  53. Configuration menu
    Copy the full SHA
    0f3e154 View commit details
    Browse the repository at this point in the history
  54. Configuration menu
    Copy the full SHA
    91b9cd9 View commit details
    Browse the repository at this point in the history
  55. Configuration menu
    Copy the full SHA
    d6a7a82 View commit details
    Browse the repository at this point in the history
  56. Style stuff

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    5a37259 View commit details
    Browse the repository at this point in the history
  57. Add DiffHighlighter

    - Implemented UnifiedDiffHighlighter
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    3a2f7c4 View commit details
    Browse the repository at this point in the history
  58. Create DiffHighlighter.css

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    48f46c9 View commit details
    Browse the repository at this point in the history
  59. Add left padding to HeaderCell

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    6f8d19a View commit details
    Browse the repository at this point in the history
  60. Move diff highlighting styles to Dark.css

    - Just for testing
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    d7f91c3 View commit details
    Browse the repository at this point in the history
  61. Configuration menu
    Copy the full SHA
    4716f4b View commit details
    Browse the repository at this point in the history
  62. Configuration menu
    Copy the full SHA
    e7817eb View commit details
    Browse the repository at this point in the history
  63. Configuration menu
    Copy the full SHA
    a1f7ac1 View commit details
    Browse the repository at this point in the history
  64. Move CopyFieldValueCommand

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    17787f9 View commit details
    Browse the repository at this point in the history
  65. Make DiffMethod public

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    46fd34e View commit details
    Browse the repository at this point in the history
  66. Move CopyFieldValueCommand

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    980a85e View commit details
    Browse the repository at this point in the history
  67. Implement SplitDiffHighlighter

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    2ef153b View commit details
    Browse the repository at this point in the history
  68. Show diffs when user selects "Show Diff" in the toolbar UI

    - Only unified diff view will be shown for now
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    ea56047 View commit details
    Browse the repository at this point in the history
  69. Configuration menu
    Copy the full SHA
    8a5b534 View commit details
    Browse the repository at this point in the history
  70. Style css stuff

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    1a25db6 View commit details
    Browse the repository at this point in the history
  71. Fix typos

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    0cf68c7 View commit details
    Browse the repository at this point in the history
  72. Refactor SplitDiffHighlighter and fix bugs

    - Added "updated" style class for styling CHANGE diffs
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    2142192 View commit details
    Browse the repository at this point in the history
  73. Configuration menu
    Copy the full SHA
    868f314 View commit details
    Browse the repository at this point in the history
  74. Allow users to switch between split and unified diff view

    - Fixed some bugs
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    a1fb604 View commit details
    Browse the repository at this point in the history
  75. Configuration menu
    Copy the full SHA
    6043305 View commit details
    Browse the repository at this point in the history
  76. Configuration menu
    Copy the full SHA
    d8d2246 View commit details
    Browse the repository at this point in the history
  77. Configuration menu
    Copy the full SHA
    e27d8f9 View commit details
    Browse the repository at this point in the history
  78. Delete EmptyCell.java

    - I might recreate it later, but for now, I'm choosing simplicity over performance
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    4891fdc View commit details
    Browse the repository at this point in the history
  79. Refactor FieldValueCell

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    3f57163 View commit details
    Browse the repository at this point in the history
  80. Configuration menu
    Copy the full SHA
    fb3509e View commit details
    Browse the repository at this point in the history
  81. Configuration menu
    Copy the full SHA
    6bb8f2c View commit details
    Browse the repository at this point in the history
  82. Configuration menu
    Copy the full SHA
    a9f3254 View commit details
    Browse the repository at this point in the history
  83. Minor styling

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    30b4f74 View commit details
    Browse the repository at this point in the history
  84. Remove DiffHighlighter.css stylesheet

    - You can find diff styles in Base.css and Dark.css
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    7022b74 View commit details
    Browse the repository at this point in the history
  85. Remove unused dependencies

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    6fee209 View commit details
    Browse the repository at this point in the history
  86. Configuration menu
    Copy the full SHA
    23223de View commit details
    Browse the repository at this point in the history
  87. Fix readme :(

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    f9c4a18 View commit details
    Browse the repository at this point in the history
  88. Configuration menu
    Copy the full SHA
    a5bc689 View commit details
    Browse the repository at this point in the history
  89. Refactor FieldValueCell

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    4bd99c2 View commit details
    Browse the repository at this point in the history
  90. Configuration menu
    Copy the full SHA
    e2d4f76 View commit details
    Browse the repository at this point in the history
  91. Configuration menu
    Copy the full SHA
    b8a3575 View commit details
    Browse the repository at this point in the history
  92. Cleanup

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    28fbefb View commit details
    Browse the repository at this point in the history
  93. Checkstyle

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    a471e20 View commit details
    Browse the repository at this point in the history
  94. Improve URL validation logic

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    03ee8c0 View commit details
    Browse the repository at this point in the history
  95. Configuration menu
    Copy the full SHA
    06df19e View commit details
    Browse the repository at this point in the history
  96. i18n

    # Conflicts:
    #	src/main/resources/l10n/JabRef_en.properties
    Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    ddee09c View commit details
    Browse the repository at this point in the history
  97. Cleanup css

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    f69c76c View commit details
    Browse the repository at this point in the history
  98. Remove redundant icon style

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    4f6d227 View commit details
    Browse the repository at this point in the history
  99. Rename style class field-value to merge-field-value

    - Since it is used in Base.css and Dark.css, it is critical to distinguish the field cell used is related to the merge UI.
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    baeb1dc View commit details
    Browse the repository at this point in the history
  100. Remove old Merge entries UI

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    9905fe0 View commit details
    Browse the repository at this point in the history
  101. Fix missing header styles

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    c37fbd3 View commit details
    Browse the repository at this point in the history
  102. i18n

    # Conflicts:
    #	src/main/resources/l10n/JabRef_en.properties
    Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    7dcc348 View commit details
    Browse the repository at this point in the history
  103. Garbage collect right cell when it's invisible

    - When both the left and right cells have the same value, only the left value is displayed, making it unnecessary to keep allocating memory for the right cell.
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    0434687 View commit details
    Browse the repository at this point in the history
  104. Fix typo

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    a4049ba View commit details
    Browse the repository at this point in the history
  105. Create GroupsFieldNameCell

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    516ca2f View commit details
    Browse the repository at this point in the history
  106. Configuration menu
    Copy the full SHA
    c4ff603 View commit details
    Browse the repository at this point in the history
  107. Configuration menu
    Copy the full SHA
    8bd1ccb View commit details
    Browse the repository at this point in the history
  108. Configuration menu
    Copy the full SHA
    6ace504 View commit details
    Browse the repository at this point in the history
  109. Delegate field name cells creation to ThreeWayMergeView

    - Seperated field values and field name cells because now it's easier to update field values cells without touching the field name cell
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    6187c26 View commit details
    Browse the repository at this point in the history
  110. Improve groups merging function

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    8580d35 View commit details
    Browse the repository at this point in the history
  111. Configuration menu
    Copy the full SHA
    5703cd4 View commit details
    Browse the repository at this point in the history
  112. Configuration menu
    Copy the full SHA
    4043a6d View commit details
    Browse the repository at this point in the history
  113. Refactoring

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    9c152c6 View commit details
    Browse the repository at this point in the history
  114. More Refactoring

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    4bf7b2e View commit details
    Browse the repository at this point in the history
  115. Configuration menu
    Copy the full SHA
    4dceb2e View commit details
    Browse the repository at this point in the history
  116. Configuration menu
    Copy the full SHA
    8cf5bc4 View commit details
    Browse the repository at this point in the history
  117. Minor refactoring

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    ffe4f04 View commit details
    Browse the repository at this point in the history
  118. Configuration menu
    Copy the full SHA
    c7edbe3 View commit details
    Browse the repository at this point in the history
  119. Configuration menu
    Copy the full SHA
    2f59a69 View commit details
    Browse the repository at this point in the history
  120. Configuration menu
    Copy the full SHA
    5ba051b View commit details
    Browse the repository at this point in the history
  121. Configuration menu
    Copy the full SHA
    fcc0667 View commit details
    Browse the repository at this point in the history
  122. Configuration menu
    Copy the full SHA
    99dd862 View commit details
    Browse the repository at this point in the history
  123. Configuration menu
    Copy the full SHA
    754d20f View commit details
    Browse the repository at this point in the history
  124. Configuration menu
    Copy the full SHA
    9561db2 View commit details
    Browse the repository at this point in the history
  125. Refactoring

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    b161536 View commit details
    Browse the repository at this point in the history
  126. Record groups merging operation using CompoundEdit

    - Exposed a public API to be able to cancel groups merge
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    1519bb1 View commit details
    Browse the repository at this point in the history
  127. Configuration menu
    Copy the full SHA
    228f56e View commit details
    Browse the repository at this point in the history
  128. Configuration menu
    Copy the full SHA
    a9d7a7f View commit details
    Browse the repository at this point in the history
  129. Configuration menu
    Copy the full SHA
    2bf5f66 View commit details
    Browse the repository at this point in the history
  130. Configuration menu
    Copy the full SHA
    7e25fe5 View commit details
    Browse the repository at this point in the history
  131. Cleanup

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    1af0bc4 View commit details
    Browse the repository at this point in the history
  132. Almost f**** everything up. I deleted GroupsFieldNameCell content by …

    …mistake, it's all ok now
    
    - I did a rebase and then when resolving conflicts, I chose "Accept Theirs" all the way but that didn't go well, now I have no history of GroupsFieldNameCell
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    43f8aca View commit details
    Browse the repository at this point in the history
  133. Checkstyle

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    9faebb6 View commit details
    Browse the repository at this point in the history
  134. Remove unused MergedGroups class

    - Because now groups merge history is kept in a compound  Edit
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    650fddf View commit details
    Browse the repository at this point in the history
  135. Configuration menu
    Copy the full SHA
    1a599f5 View commit details
    Browse the repository at this point in the history
  136. Cancel merge groups edit in the DuplicateResolverDialog when user cho…

    …ose 'Cancel' button
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    fde0bb7 View commit details
    Browse the repository at this point in the history
  137. i18n

    # Conflicts:
    #	src/main/resources/l10n/JabRef_en.properties
    Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    008e7ea View commit details
    Browse the repository at this point in the history
  138. Configuration menu
    Copy the full SHA
    5bf4ad9 View commit details
    Browse the repository at this point in the history
  139. Configuration menu
    Copy the full SHA
    73ddbc8 View commit details
    Browse the repository at this point in the history
  140. Optimize imports

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    d05373b View commit details
    Browse the repository at this point in the history
  141. Configuration menu
    Copy the full SHA
    6522f94 View commit details
    Browse the repository at this point in the history
  142. Configuration menu
    Copy the full SHA
    b7ab235 View commit details
    Browse the repository at this point in the history
  143. Remove unused property

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    4212cc7 View commit details
    Browse the repository at this point in the history
  144. [WIP] Convert ThreeFieldValues to MVVM

    - Together with my mentors, we decided to convert ThreeFieldValues to MVVM in order to maintain the codebase consistency and facilitate testing. The view is ThreeFieldValues, and it has a view model.
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    c8d47b4 View commit details
    Browse the repository at this point in the history
  145. Configuration menu
    Copy the full SHA
    884aa53 View commit details
    Browse the repository at this point in the history
  146. Configuration menu
    Copy the full SHA
    ae6babd View commit details
    Browse the repository at this point in the history
  147. Move initial selection code to the view model

    - Replaced addListener() with EasyBind#subscribe
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    f0c1f1c View commit details
    Browse the repository at this point in the history
  148. Refactor

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    ae99ef4 View commit details
    Browse the repository at this point in the history
  149. Configuration menu
    Copy the full SHA
    e16ae47 View commit details
    Browse the repository at this point in the history
  150. Configuration menu
    Copy the full SHA
    737045a View commit details
    Browse the repository at this point in the history
  151. Configuration menu
    Copy the full SHA
    acf63ee View commit details
    Browse the repository at this point in the history
  152. Configuration menu
    Copy the full SHA
    1dfe8a4 View commit details
    Browse the repository at this point in the history
  153. Pass Bib entries to ThreeFieldValuesView rather than raw string

    - Because I want to add the merge/unmerge commands to ThreeFieldValuesView and I need to have a reference to left and right bib entries
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    0210d71 View commit details
    Browse the repository at this point in the history
  154. Configuration menu
    Copy the full SHA
    6a768eb View commit details
    Browse the repository at this point in the history
  155. Configuration menu
    Copy the full SHA
    e48bcbe View commit details
    Browse the repository at this point in the history
  156. Configuration menu
    Copy the full SHA
    12e6f40 View commit details
    Browse the repository at this point in the history
  157. Configuration menu
    Copy the full SHA
    75260de View commit details
    Browse the repository at this point in the history
  158. Update left and right field value properties when merging fields rath…

    …er than the bib entries
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    f3efc40 View commit details
    Browse the repository at this point in the history
  159. Configuration menu
    Copy the full SHA
    6d3e7cd View commit details
    Browse the repository at this point in the history
  160. Cleanup

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    184cd1a View commit details
    Browse the repository at this point in the history
  161. Configuration menu
    Copy the full SHA
    874952e View commit details
    Browse the repository at this point in the history
  162. Configuration menu
    Copy the full SHA
    3541cd5 View commit details
    Browse the repository at this point in the history
  163. Configuration menu
    Copy the full SHA
    075da2b View commit details
    Browse the repository at this point in the history
  164. Configuration menu
    Copy the full SHA
    b2ddc8a View commit details
    Browse the repository at this point in the history
  165. Delete cancelGroupsEdit()

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    fb40879 View commit details
    Browse the repository at this point in the history
  166. Configuration menu
    Copy the full SHA
    2c7339a View commit details
    Browse the repository at this point in the history
  167. Configuration menu
    Copy the full SHA
    11fb4f1 View commit details
    Browse the repository at this point in the history
  168. Configuration menu
    Copy the full SHA
    ef212c0 View commit details
    Browse the repository at this point in the history
  169. Cleanup

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    3752f16 View commit details
    Browse the repository at this point in the history
  170. Configuration menu
    Copy the full SHA
    0a8f9d7 View commit details
    Browse the repository at this point in the history
  171. Fix typos

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    6eea335 View commit details
    Browse the repository at this point in the history
  172. Configuration menu
    Copy the full SHA
    e1667d9 View commit details
    Browse the repository at this point in the history
  173. Logging

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    383dd76 View commit details
    Browse the repository at this point in the history
  174. Implement merging comments

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    2f58d9b View commit details
    Browse the repository at this point in the history
  175. Configuration menu
    Copy the full SHA
    4aaabf0 View commit details
    Browse the repository at this point in the history
  176. Configuration menu
    Copy the full SHA
    ecf1eeb View commit details
    Browse the repository at this point in the history
  177. Implement file merging

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    b1e2951 View commit details
    Browse the repository at this point in the history
  178. Configuration menu
    Copy the full SHA
    dd8457c View commit details
    Browse the repository at this point in the history
  179. Configuration menu
    Copy the full SHA
    8c3a1e0 View commit details
    Browse the repository at this point in the history
  180. Configuration menu
    Copy the full SHA
    15f3de3 View commit details
    Browse the repository at this point in the history
  181. Remove MergeableFieldCell dependency from the merge/unmerge commands

    - Thus commands can be moved to the view model
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    eb8429c View commit details
    Browse the repository at this point in the history
  182. Add logs

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    09b6073 View commit details
    Browse the repository at this point in the history
  183. Configuration menu
    Copy the full SHA
    2ef9a52 View commit details
    Browse the repository at this point in the history
  184. Update code documentation

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    c3c76cb View commit details
    Browse the repository at this point in the history
  185. Configuration menu
    Copy the full SHA
    4829168 View commit details
    Browse the repository at this point in the history
  186. Configuration menu
    Copy the full SHA
    fa3927d View commit details
    Browse the repository at this point in the history
  187. Decompose the ToggleMergeUnmergeButton into its own class (or component)

    - Removed FieldNameCellFactory.java and MergeableFieldCell.java
    - Made it easier to add more side buttons in the future
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    d707561 View commit details
    Browse the repository at this point in the history
  188. Configuration menu
    Copy the full SHA
    94626dc View commit details
    Browse the repository at this point in the history
  189. Configuration menu
    Copy the full SHA
    dc9293d View commit details
    Browse the repository at this point in the history
  190. Configuration menu
    Copy the full SHA
    a984a97 View commit details
    Browse the repository at this point in the history
  191. Configuration menu
    Copy the full SHA
    fce5ff9 View commit details
    Browse the repository at this point in the history
  192. Configuration menu
    Copy the full SHA
    b9d7bc1 View commit details
    Browse the repository at this point in the history
  193. Configuration menu
    Copy the full SHA
    3811561 View commit details
    Browse the repository at this point in the history
  194. Wrap the UI in a dialog pane

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    00722e1 View commit details
    Browse the repository at this point in the history
  195. Configuration menu
    Copy the full SHA
    ba86932 View commit details
    Browse the repository at this point in the history
  196. Populate table view with changes

    - Initialized the change name column
    - Commented out 'getDialogPane().setContent(pane)' because it will be removed later
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    1f908f6 View commit details
    Browse the repository at this point in the history
  197. Configuration menu
    Copy the full SHA
    71c2144 View commit details
    Browse the repository at this point in the history
  198. Configuration menu
    Copy the full SHA
    97a5f1d View commit details
    Browse the repository at this point in the history
  199. Configuration menu
    Copy the full SHA
    bad443b View commit details
    Browse the repository at this point in the history
  200. Apply changes when before the dialog

    - Changes are applied only when all changes are resolved (changes table is empty). Like a transaction
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    3b31d58 View commit details
    Browse the repository at this point in the history
  201. Cleanup FXML

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    54daebb View commit details
    Browse the repository at this point in the history
  202. Remove old UI code

    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    3e9cd28 View commit details
    Browse the repository at this point in the history
  203. Configuration menu
    Copy the full SHA
    c5599b7 View commit details
    Browse the repository at this point in the history
  204. Configuration menu
    Copy the full SHA
    16bb186 View commit details
    Browse the repository at this point in the history
  205. Configuration menu
    Copy the full SHA
    263aa60 View commit details
    Browse the repository at this point in the history
  206. Configuration menu
    Copy the full SHA
    f0fbd87 View commit details
    Browse the repository at this point in the history
  207. Don't open the advanced merge dialog when 'makeChange()' is called on…

    … 'EntryChangeViewModel'
    HoussemNasri authored and Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    0d33e57 View commit details
    Browse the repository at this point in the history
  208. Configuration menu
    Copy the full SHA
    358b235 View commit details
    Browse the repository at this point in the history
  209. Configuration menu
    Copy the full SHA
    76f8849 View commit details
    Browse the repository at this point in the history
  210. Merge branch 'GSOC-improve-collab-dialog' of github.com:JabRef/jabref…

    … into GSOC-improve-collab-dialog
    
    * 'GSOC-improve-collab-dialog' of github.com:JabRef/jabref: (199 commits)
      Display information about the selected change in the bottom detail node
      Display a preview of the deleted entry
      Don't open the advanced merge dialog when 'makeChange()' is called on 'EntryChangeViewModel'
      Open the advanced merge dialog when 'Merge...' is clicked
      Select the first change after opening the dialog
      Enable the 'Merge...' button only if the selected change has an advanced merge dialog
      Close dialog when all changes are resolved
      Remove old UI code
      Cleanup FXML
      Apply changes when before the dialog
      Rename 'Accept Theirs' to 'Accept' and 'Accept Yours' to 'Deny'
      Allow selecting multiple changes
      Remove 'Accept changes' and 'Dismiss' buttons from the dialog
      Populate table view with changes
      Convert change name to a StringProperty instead of a raw string
      Wrap the UI in a dialog pane
      Implement a method for opening an advanced merge dialog for modified entries
      Design the ExternalChangesResolverDialog
      Create ExternalChangesResolverViewModel
      Rename ChangeDisplayDialog.java to ExternalChangesResolverDialog.java
      ...
    Siedlerchr committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    698b801 View commit details
    Browse the repository at this point in the history