-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
Commits on Jul 18, 2022
-
Configuration menu - View commit details
-
Copy full SHA for be4a7c5 - Browse repository at this point
Copy the full SHA be4a7c5View commit details
Commits on Jul 25, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 76f0063 - Browse repository at this point
Copy the full SHA 76f0063View commit details -
Configuration menu - View commit details
-
Copy full SHA for cd41230 - Browse repository at this point
Copy the full SHA cd41230View commit details
Commits on Jul 26, 2022
-
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>
Configuration menu - View commit details
-
Copy full SHA for c51a486 - Browse repository at this point
Copy the full SHA c51a486View commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 7df24b9 - Browse repository at this point
Copy the full SHA 7df24b9View commit details -
Bump unoloader from 7.3.4 to 7.3.5 (#8996)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 160b805 - Browse repository at this point
Copy the full SHA 160b805View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8ab7635 - Browse repository at this point
Copy the full SHA 8ab7635View commit details -
Configuration menu - View commit details
-
Copy full SHA for 36c64dc - Browse repository at this point
Copy the full SHA 36c64dcView commit details
Commits on Jul 29, 2022
-
Configuration menu - View commit details
-
Copy full SHA for bd8ede5 - Browse repository at this point
Copy the full SHA bd8ede5View commit details
Commits on Aug 1, 2022
-
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 committedAug 1, 2022 Configuration menu - View commit details
-
Copy full SHA for 871c8d7 - Browse repository at this point
Copy the full SHA 871c8d7View commit details -
Merge commit '871c8d749be52a96fef3900a52084359b31fcaf9'
github actions committedAug 1, 2022 Configuration menu - View commit details
-
Copy full SHA for e0b94aa - Browse repository at this point
Copy the full SHA e0b94aaView commit details -
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 committedAug 1, 2022 Configuration menu - View commit details
-
Copy full SHA for 4ee5553 - Browse repository at this point
Copy the full SHA 4ee5553View commit details -
Merge commit '4ee5553507c43af9829bb979472c8362702b1105'
github actions committedAug 1, 2022 Configuration menu - View commit details
-
Copy full SHA for 90fda18 - Browse repository at this point
Copy the full SHA 90fda18View commit details -
Merge pull request #9004 from JabRef/refresh-csl
[Bot] Update CSL styles
Configuration menu - View commit details
-
Copy full SHA for 9d9afdc - Browse repository at this point
Copy the full SHA 9d9afdcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 277df6f - Browse repository at this point
Copy the full SHA 277df6fView commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 5338cfe - Browse repository at this point
Copy the full SHA 5338cfeView commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for ffecadd - Browse repository at this point
Copy the full SHA ffecaddView commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 91105e5 - Browse repository at this point
Copy the full SHA 91105e5View commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 8389254 - Browse repository at this point
Copy the full SHA 8389254View commit details -
Support biblatex apa citation for legal entry types (#8966)
Co-authored-by: Siedlerchr <siedlerkiller@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 02f51f7 - Browse repository at this point
Copy the full SHA 02f51f7View commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 0a1e98b - Browse repository at this point
Copy the full SHA 0a1e98bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0d82506 - Browse repository at this point
Copy the full SHA 0d82506View commit details -
Configuration menu - View commit details
-
Copy full SHA for b7a7401 - Browse repository at this point
Copy the full SHA b7a7401View commit details
Commits on Aug 2, 2022
-
* 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)
Configuration menu - View commit details
-
Copy full SHA for baae43b - Browse repository at this point
Copy the full SHA baae43bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 891feb6 - Browse repository at this point
Copy the full SHA 891feb6View commit details -
Configuration menu - View commit details
-
Copy full SHA for feb0628 - Browse repository at this point
Copy the full SHA feb0628View commit details -
Configuration menu - View commit details
-
Copy full SHA for 328ce97 - Browse repository at this point
Copy the full SHA 328ce97View commit details -
Configuration menu - View commit details
-
Copy full SHA for b8ce549 - Browse repository at this point
Copy the full SHA b8ce549View commit details -
Configuration menu - View commit details
-
Copy full SHA for 588db57 - Browse repository at this point
Copy the full SHA 588db57View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0af8175 - Browse repository at this point
Copy the full SHA 0af8175View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0e128d2 - Browse repository at this point
Copy the full SHA 0e128d2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f1366a - Browse repository at this point
Copy the full SHA 0f1366aView commit details -
Populate table view with changes
- Initialized the change name column - Commented out 'getDialogPane().setContent(pane)' because it will be removed later
Configuration menu - View commit details
-
Copy full SHA for 241ae86 - Browse repository at this point
Copy the full SHA 241ae86View commit details -
Configuration menu - View commit details
-
Copy full SHA for b3ddc88 - Browse repository at this point
Copy the full SHA b3ddc88View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6bf045b - Browse repository at this point
Copy the full SHA 6bf045bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0be74a6 - Browse repository at this point
Copy the full SHA 0be74a6View commit details -
Apply changes when before the dialog
- Changes are applied only when all changes are resolved (changes table is empty). Like a transaction
Configuration menu - View commit details
-
Copy full SHA for 5cd88eb - Browse repository at this point
Copy the full SHA 5cd88ebView commit details -
Configuration menu - View commit details
-
Copy full SHA for fe4b582 - Browse repository at this point
Copy the full SHA fe4b582View commit details -
Configuration menu - View commit details
-
Copy full SHA for fc656d9 - Browse repository at this point
Copy the full SHA fc656d9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 12ec6c5 - Browse repository at this point
Copy the full SHA 12ec6c5View commit details
Commits on Aug 3, 2022
-
Enable the 'Merge...' button only if the selected change has an advan…
…ced merge dialog
Configuration menu - View commit details
-
Copy full SHA for f9292de - Browse repository at this point
Copy the full SHA f9292deView commit details -
Configuration menu - View commit details
-
Copy full SHA for dd46057 - Browse repository at this point
Copy the full SHA dd46057View commit details -
Configuration menu - View commit details
-
Copy full SHA for 57062ce - Browse repository at this point
Copy the full SHA 57062ceView commit details -
Don't open the advanced merge dialog when 'makeChange()' is called on…
… 'EntryChangeViewModel'
Configuration menu - View commit details
-
Copy full SHA for d90c418 - Browse repository at this point
Copy the full SHA d90c418View commit details -
Configuration menu - View commit details
-
Copy full SHA for ea33534 - Browse repository at this point
Copy the full SHA ea33534View commit details -
Configuration menu - View commit details
-
Copy full SHA for c4274a9 - Browse repository at this point
Copy the full SHA c4274a9View commit details -
Configuration menu - View commit details
-
Copy full SHA for f0d8cb3 - Browse repository at this point
Copy the full SHA f0d8cb3View commit details -
Configuration menu - View commit details
-
Copy full SHA for ca627bc - Browse repository at this point
Copy the full SHA ca627bcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f463db - Browse repository at this point
Copy the full SHA 0f463dbView commit details -
Merge remote-tracking branch 'upstream/main' into GSOC-improve-collab…
…-dialog * upstream/main: New Crowdin updates (#9016)
Configuration menu - View commit details
-
Copy full SHA for 3ad3a83 - Browse repository at this point
Copy the full SHA 3ad3a83View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8ecf890 - Browse repository at this point
Copy the full SHA 8ecf890View commit details -
Configuration menu - View commit details
-
Copy full SHA for ee988f9 - Browse repository at this point
Copy the full SHA ee988f9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0b9a345 - Browse repository at this point
Copy the full SHA 0b9a345View commit details -
Configuration menu - View commit details
-
Copy full SHA for 93a17c6 - Browse repository at this point
Copy the full SHA 93a17c6View commit details -
Make FieldValueCell selectable
- Defined style class - Defined pseudo class for the selected state - Created the selection box UI
Configuration menu - View commit details
-
Copy full SHA for 2d2c1ff - Browse repository at this point
Copy the full SHA 2d2c1ffView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5329e29 - Browse repository at this point
Copy the full SHA 5329e29View commit details -
Configuration menu - View commit details
-
Copy full SHA for f184ed2 - Browse repository at this point
Copy the full SHA f184ed2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 111a211 - Browse repository at this point
Copy the full SHA 111a211View commit details -
Configuration menu - View commit details
-
Copy full SHA for e30db74 - Browse repository at this point
Copy the full SHA e30db74View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1c7e012 - Browse repository at this point
Copy the full SHA 1c7e012View commit details -
Configuration menu - View commit details
-
Copy full SHA for 249bec9 - Browse repository at this point
Copy the full SHA 249bec9View commit details -
Fix a bug that causes the selection of both left and right field cell…
…s simultaneously. - Added a style class for field value cell
Configuration menu - View commit details
-
Copy full SHA for c12a352 - Browse repository at this point
Copy the full SHA c12a352View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for fa86607 - Browse repository at this point
Copy the full SHA fa86607View commit details -
Configuration menu - View commit details
-
Copy full SHA for e8fef63 - Browse repository at this point
Copy the full SHA e8fef63View commit details -
Disable left or right FieldValueCell when it's empty
- Added getters for row cells
Configuration menu - View commit details
-
Copy full SHA for 70180f2 - Browse repository at this point
Copy the full SHA 70180f2View commit details -
Configuration menu - View commit details
-
Copy full SHA for d90fcf2 - Browse repository at this point
Copy the full SHA d90fcf2View commit details -
Design and implement the merge toolbox
- It will be added to the top of the merge dialog
Configuration menu - View commit details
-
Copy full SHA for a3091c6 - Browse repository at this point
Copy the full SHA a3091c6View commit details -
Implement the initial prototype of the new merge UI
- Renamed ThreeWayMerge.java to ThreeWayMergeView
Configuration menu - View commit details
-
Copy full SHA for e9a410e - Browse repository at this point
Copy the full SHA e9a410eView commit details -
Use ThreeWayMergeView in MergeEntriesDialog
- At this stage headers aren't updated and merged bib entry is not created
Configuration menu - View commit details
-
Copy full SHA for 180493d - Browse repository at this point
Copy the full SHA 180493dView commit details -
Configuration menu - View commit details
-
Copy full SHA for f80aa41 - Browse repository at this point
Copy the full SHA f80aa41View commit details -
Configuration menu - View commit details
-
Copy full SHA for 819ac4e - Browse repository at this point
Copy the full SHA 819ac4eView commit details -
Wrap the copy icon inside a button
- Updated the selection box UI
Configuration menu - View commit details
-
Copy full SHA for 7f4cd2f - Browse repository at this point
Copy the full SHA 7f4cd2fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 823125c - Browse repository at this point
Copy the full SHA 823125cView commit details -
Configuration menu - View commit details
-
Copy full SHA for ca5d4f3 - Browse repository at this point
Copy the full SHA ca5d4f3View commit details -
Configuration menu - View commit details
-
Copy full SHA for ec78eec - Browse repository at this point
Copy the full SHA ec78eecView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5c093e0 - Browse repository at this point
Copy the full SHA 5c093e0View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 9d6a921 - Browse repository at this point
Copy the full SHA 9d6a921View commit details -
Configuration menu - View commit details
-
Copy full SHA for db5f3a0 - Browse repository at this point
Copy the full SHA db5f3a0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0918e79 - Browse repository at this point
Copy the full SHA 0918e79View commit details -
Copy field value to Clipboard user clicks on the copy button
- Renamed copy-icon style class - Used ActionFactory for creating the copy icon button
Configuration menu - View commit details
-
Copy full SHA for 32ad571 - Browse repository at this point
Copy the full SHA 32ad571View commit details -
Implement a more complete HeaderView
- Created ColumnConstraints that matches the field grid constraints, so when the window is resized grid and header resize equally
Configuration menu - View commit details
-
Copy full SHA for 7ed7250 - Browse repository at this point
Copy the full SHA 7ed7250View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0197257 - Browse repository at this point
Copy the full SHA 0197257View commit details -
Configuration menu - View commit details
-
Copy full SHA for 95ea40f - Browse repository at this point
Copy the full SHA 95ea40fView commit details -
Add the entry type field at the top of the fields list
- Sorted fields by name - Removed internal fields
Configuration menu - View commit details
-
Copy full SHA for 8becfc1 - Browse repository at this point
Copy the full SHA 8becfc1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6042d69 - Browse repository at this point
Copy the full SHA 6042d69View commit details -
Configuration menu - View commit details
-
Copy full SHA for 390762b - Browse repository at this point
Copy the full SHA 390762bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 91dd860 - Browse repository at this point
Copy the full SHA 91dd860View commit details -
Configuration menu - View commit details
-
Copy full SHA for 32a9ffb - Browse repository at this point
Copy the full SHA 32a9ffbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0a5fb15 - Browse repository at this point
Copy the full SHA 0a5fb15View commit details -
Create EmptyCell for optimization
- When cell is empty there is no point of creating a label object
Configuration menu - View commit details
-
Copy full SHA for 4267cf6 - Browse repository at this point
Copy the full SHA 4267cf6View commit details -
Configuration menu - View commit details
-
Copy full SHA for ef3271c - Browse repository at this point
Copy the full SHA ef3271cView commit details -
Configuration menu - View commit details
-
Copy full SHA for cac4f11 - Browse repository at this point
Copy the full SHA cac4f11View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f3e154 - Browse repository at this point
Copy the full SHA 0f3e154View commit details -
Configuration menu - View commit details
-
Copy full SHA for 91b9cd9 - Browse repository at this point
Copy the full SHA 91b9cd9View commit details -
Configuration menu - View commit details
-
Copy full SHA for d6a7a82 - Browse repository at this point
Copy the full SHA d6a7a82View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5a37259 - Browse repository at this point
Copy the full SHA 5a37259View commit details -
- Implemented UnifiedDiffHighlighter
Configuration menu - View commit details
-
Copy full SHA for 3a2f7c4 - Browse repository at this point
Copy the full SHA 3a2f7c4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 48f46c9 - Browse repository at this point
Copy the full SHA 48f46c9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6f8d19a - Browse repository at this point
Copy the full SHA 6f8d19aView commit details -
Move diff highlighting styles to Dark.css
- Just for testing
Configuration menu - View commit details
-
Copy full SHA for d7f91c3 - Browse repository at this point
Copy the full SHA d7f91c3View commit details -
Show differences between left and right values using a unified diff view
- Just for testing
Configuration menu - View commit details
-
Copy full SHA for 4716f4b - Browse repository at this point
Copy the full SHA 4716f4bView commit details -
Configuration menu - View commit details
-
Copy full SHA for e7817eb - Browse repository at this point
Copy the full SHA e7817ebView commit details -
Configuration menu - View commit details
-
Copy full SHA for a1f7ac1 - Browse repository at this point
Copy the full SHA a1f7ac1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 17787f9 - Browse repository at this point
Copy the full SHA 17787f9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 46fd34e - Browse repository at this point
Copy the full SHA 46fd34eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 980a85e - Browse repository at this point
Copy the full SHA 980a85eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2ef153b - Browse repository at this point
Copy the full SHA 2ef153bView commit details -
Show diffs when user selects "Show Diff" in the toolbar UI
- Only unified diff view will be shown for now
Configuration menu - View commit details
-
Copy full SHA for ea56047 - Browse repository at this point
Copy the full SHA ea56047View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8a5b534 - Browse repository at this point
Copy the full SHA 8a5b534View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1a25db6 - Browse repository at this point
Copy the full SHA 1a25db6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0cf68c7 - Browse repository at this point
Copy the full SHA 0cf68c7View commit details -
Refactor SplitDiffHighlighter and fix bugs
- Added "updated" style class for styling CHANGE diffs
Configuration menu - View commit details
-
Copy full SHA for 2142192 - Browse repository at this point
Copy the full SHA 2142192View commit details -
Configuration menu - View commit details
-
Copy full SHA for 868f314 - Browse repository at this point
Copy the full SHA 868f314View commit details -
Allow users to switch between split and unified diff view
- Fixed some bugs
Configuration menu - View commit details
-
Copy full SHA for a1fb604 - Browse repository at this point
Copy the full SHA a1fb604View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6043305 - Browse repository at this point
Copy the full SHA 6043305View commit details -
Configuration menu - View commit details
-
Copy full SHA for d8d2246 - Browse repository at this point
Copy the full SHA d8d2246View commit details -
Configuration menu - View commit details
-
Copy full SHA for e27d8f9 - Browse repository at this point
Copy the full SHA e27d8f9View commit details -
- I might recreate it later, but for now, I'm choosing simplicity over performance
Configuration menu - View commit details
-
Copy full SHA for 4891fdc - Browse repository at this point
Copy the full SHA 4891fdcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3f57163 - Browse repository at this point
Copy the full SHA 3f57163View commit details -
Configuration menu - View commit details
-
Copy full SHA for fb3509e - Browse repository at this point
Copy the full SHA fb3509eView commit details -
Expose an API to change diff view and highlight method from outside t…
…he merge toolbar
Configuration menu - View commit details
-
Copy full SHA for 6bb8f2c - Browse repository at this point
Copy the full SHA 6bb8f2cView commit details -
Configuration menu - View commit details
-
Copy full SHA for a9f3254 - Browse repository at this point
Copy the full SHA a9f3254View commit details -
Configuration menu - View commit details
-
Copy full SHA for 30b4f74 - Browse repository at this point
Copy the full SHA 30b4f74View commit details -
Remove DiffHighlighter.css stylesheet
- You can find diff styles in Base.css and Dark.css
Configuration menu - View commit details
-
Copy full SHA for 7022b74 - Browse repository at this point
Copy the full SHA 7022b74View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6fee209 - Browse repository at this point
Copy the full SHA 6fee209View commit details -
Configuration menu - View commit details
-
Copy full SHA for 23223de - Browse repository at this point
Copy the full SHA 23223deView commit details -
Configuration menu - View commit details
-
Copy full SHA for f9c4a18 - Browse repository at this point
Copy the full SHA f9c4a18View commit details -
Configuration menu - View commit details
-
Copy full SHA for a5bc689 - Browse repository at this point
Copy the full SHA a5bc689View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4bd99c2 - Browse repository at this point
Copy the full SHA 4bd99c2View commit details -
Configuration menu - View commit details
-
Copy full SHA for e2d4f76 - Browse repository at this point
Copy the full SHA e2d4f76View commit details -
Configuration menu - View commit details
-
Copy full SHA for b8a3575 - Browse repository at this point
Copy the full SHA b8a3575View commit details -
Configuration menu - View commit details
-
Copy full SHA for 28fbefb - Browse repository at this point
Copy the full SHA 28fbefbView commit details -
Configuration menu - View commit details
-
Copy full SHA for a471e20 - Browse repository at this point
Copy the full SHA a471e20View commit details -
Configuration menu - View commit details
-
Copy full SHA for 03ee8c0 - Browse repository at this point
Copy the full SHA 03ee8c0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 06df19e - Browse repository at this point
Copy the full SHA 06df19eView commit details -
Configuration menu - View commit details
-
Copy full SHA for ddee09c - Browse repository at this point
Copy the full SHA ddee09cView commit details -
Configuration menu - View commit details
-
Copy full SHA for f69c76c - Browse repository at this point
Copy the full SHA f69c76cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4f6d227 - Browse repository at this point
Copy the full SHA 4f6d227View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for baeb1dc - Browse repository at this point
Copy the full SHA baeb1dcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9905fe0 - Browse repository at this point
Copy the full SHA 9905fe0View commit details -
Configuration menu - View commit details
-
Copy full SHA for c37fbd3 - Browse repository at this point
Copy the full SHA c37fbd3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7dcc348 - Browse repository at this point
Copy the full SHA 7dcc348View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 0434687 - Browse repository at this point
Copy the full SHA 0434687View commit details -
Configuration menu - View commit details
-
Copy full SHA for a4049ba - Browse repository at this point
Copy the full SHA a4049baView commit details -
Configuration menu - View commit details
-
Copy full SHA for 516ca2f - Browse repository at this point
Copy the full SHA 516ca2fView commit details -
Configuration menu - View commit details
-
Copy full SHA for c4ff603 - Browse repository at this point
Copy the full SHA c4ff603View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8bd1ccb - Browse repository at this point
Copy the full SHA 8bd1ccbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6ace504 - Browse repository at this point
Copy the full SHA 6ace504View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 6187c26 - Browse repository at this point
Copy the full SHA 6187c26View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8580d35 - Browse repository at this point
Copy the full SHA 8580d35View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5703cd4 - Browse repository at this point
Copy the full SHA 5703cd4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4043a6d - Browse repository at this point
Copy the full SHA 4043a6dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9c152c6 - Browse repository at this point
Copy the full SHA 9c152c6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4bf7b2e - Browse repository at this point
Copy the full SHA 4bf7b2eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4dceb2e - Browse repository at this point
Copy the full SHA 4dceb2eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8cf5bc4 - Browse repository at this point
Copy the full SHA 8cf5bc4View commit details -
Configuration menu - View commit details
-
Copy full SHA for ffe4f04 - Browse repository at this point
Copy the full SHA ffe4f04View commit details -
Configuration menu - View commit details
-
Copy full SHA for c7edbe3 - Browse repository at this point
Copy the full SHA c7edbe3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2f59a69 - Browse repository at this point
Copy the full SHA 2f59a69View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5ba051b - Browse repository at this point
Copy the full SHA 5ba051bView commit details -
Configuration menu - View commit details
-
Copy full SHA for fcc0667 - Browse repository at this point
Copy the full SHA fcc0667View commit details -
Configuration menu - View commit details
-
Copy full SHA for 99dd862 - Browse repository at this point
Copy the full SHA 99dd862View commit details -
Configuration menu - View commit details
-
Copy full SHA for 754d20f - Browse repository at this point
Copy the full SHA 754d20fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9561db2 - Browse repository at this point
Copy the full SHA 9561db2View commit details -
Configuration menu - View commit details
-
Copy full SHA for b161536 - Browse repository at this point
Copy the full SHA b161536View commit details -
Record groups merging operation using CompoundEdit
- Exposed a public API to be able to cancel groups merge
Configuration menu - View commit details
-
Copy full SHA for 1519bb1 - Browse repository at this point
Copy the full SHA 1519bb1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 228f56e - Browse repository at this point
Copy the full SHA 228f56eView commit details -
Configuration menu - View commit details
-
Copy full SHA for a9d7a7f - Browse repository at this point
Copy the full SHA a9d7a7fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2bf5f66 - Browse repository at this point
Copy the full SHA 2bf5f66View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7e25fe5 - Browse repository at this point
Copy the full SHA 7e25fe5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1af0bc4 - Browse repository at this point
Copy the full SHA 1af0bc4View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 43f8aca - Browse repository at this point
Copy the full SHA 43f8acaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9faebb6 - Browse repository at this point
Copy the full SHA 9faebb6View commit details -
Remove unused MergedGroups class
- Because now groups merge history is kept in a compound Edit
Configuration menu - View commit details
-
Copy full SHA for 650fddf - Browse repository at this point
Copy the full SHA 650fddfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1a599f5 - Browse repository at this point
Copy the full SHA 1a599f5View commit details -
Cancel merge groups edit in the DuplicateResolverDialog when user cho…
…ose 'Cancel' button
Configuration menu - View commit details
-
Copy full SHA for fde0bb7 - Browse repository at this point
Copy the full SHA fde0bb7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 008e7ea - Browse repository at this point
Copy the full SHA 008e7eaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5bf4ad9 - Browse repository at this point
Copy the full SHA 5bf4ad9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 73ddbc8 - Browse repository at this point
Copy the full SHA 73ddbc8View commit details -
Configuration menu - View commit details
-
Copy full SHA for d05373b - Browse repository at this point
Copy the full SHA d05373bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6522f94 - Browse repository at this point
Copy the full SHA 6522f94View commit details -
Configuration menu - View commit details
-
Copy full SHA for b7ab235 - Browse repository at this point
Copy the full SHA b7ab235View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4212cc7 - Browse repository at this point
Copy the full SHA 4212cc7View commit details -
[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.
Configuration menu - View commit details
-
Copy full SHA for c8d47b4 - Browse repository at this point
Copy the full SHA c8d47b4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 884aa53 - Browse repository at this point
Copy the full SHA 884aa53View commit details -
Configuration menu - View commit details
-
Copy full SHA for ae6babd - Browse repository at this point
Copy the full SHA ae6babdView commit details -
Move initial selection code to the view model
- Replaced addListener() with EasyBind#subscribe
Configuration menu - View commit details
-
Copy full SHA for f0c1f1c - Browse repository at this point
Copy the full SHA f0c1f1cView commit details -
Configuration menu - View commit details
-
Copy full SHA for ae99ef4 - Browse repository at this point
Copy the full SHA ae99ef4View commit details -
Configuration menu - View commit details
-
Copy full SHA for e16ae47 - Browse repository at this point
Copy the full SHA e16ae47View commit details -
Configuration menu - View commit details
-
Copy full SHA for 737045a - Browse repository at this point
Copy the full SHA 737045aView commit details -
Configuration menu - View commit details
-
Copy full SHA for acf63ee - Browse repository at this point
Copy the full SHA acf63eeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1dfe8a4 - Browse repository at this point
Copy the full SHA 1dfe8a4View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 0210d71 - Browse repository at this point
Copy the full SHA 0210d71View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6a768eb - Browse repository at this point
Copy the full SHA 6a768ebView commit details -
Configuration menu - View commit details
-
Copy full SHA for e48bcbe - Browse repository at this point
Copy the full SHA e48bcbeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 12e6f40 - Browse repository at this point
Copy the full SHA 12e6f40View commit details -
Configuration menu - View commit details
-
Copy full SHA for 75260de - Browse repository at this point
Copy the full SHA 75260deView commit details -
Update left and right field value properties when merging fields rath…
…er than the bib entries
Configuration menu - View commit details
-
Copy full SHA for f3efc40 - Browse repository at this point
Copy the full SHA f3efc40View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6d3e7cd - Browse repository at this point
Copy the full SHA 6d3e7cdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 184cd1a - Browse repository at this point
Copy the full SHA 184cd1aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 874952e - Browse repository at this point
Copy the full SHA 874952eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3541cd5 - Browse repository at this point
Copy the full SHA 3541cd5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 075da2b - Browse repository at this point
Copy the full SHA 075da2bView commit details -
Configuration menu - View commit details
-
Copy full SHA for b2ddc8a - Browse repository at this point
Copy the full SHA b2ddc8aView commit details -
Configuration menu - View commit details
-
Copy full SHA for fb40879 - Browse repository at this point
Copy the full SHA fb40879View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2c7339a - Browse repository at this point
Copy the full SHA 2c7339aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 11fb4f1 - Browse repository at this point
Copy the full SHA 11fb4f1View commit details -
Configuration menu - View commit details
-
Copy full SHA for ef212c0 - Browse repository at this point
Copy the full SHA ef212c0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3752f16 - Browse repository at this point
Copy the full SHA 3752f16View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0a8f9d7 - Browse repository at this point
Copy the full SHA 0a8f9d7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6eea335 - Browse repository at this point
Copy the full SHA 6eea335View commit details -
Configuration menu - View commit details
-
Copy full SHA for e1667d9 - Browse repository at this point
Copy the full SHA e1667d9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 383dd76 - Browse repository at this point
Copy the full SHA 383dd76View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2f58d9b - Browse repository at this point
Copy the full SHA 2f58d9bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4aaabf0 - Browse repository at this point
Copy the full SHA 4aaabf0View commit details -
Configuration menu - View commit details
-
Copy full SHA for ecf1eeb - Browse repository at this point
Copy the full SHA ecf1eebView commit details -
Configuration menu - View commit details
-
Copy full SHA for b1e2951 - Browse repository at this point
Copy the full SHA b1e2951View commit details -
Configuration menu - View commit details
-
Copy full SHA for dd8457c - Browse repository at this point
Copy the full SHA dd8457cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c3a1e0 - Browse repository at this point
Copy the full SHA 8c3a1e0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 15f3de3 - Browse repository at this point
Copy the full SHA 15f3de3View commit details -
Remove MergeableFieldCell dependency from the merge/unmerge commands
- Thus commands can be moved to the view model
Configuration menu - View commit details
-
Copy full SHA for eb8429c - Browse repository at this point
Copy the full SHA eb8429cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 09b6073 - Browse repository at this point
Copy the full SHA 09b6073View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2ef9a52 - Browse repository at this point
Copy the full SHA 2ef9a52View commit details -
Configuration menu - View commit details
-
Copy full SHA for c3c76cb - Browse repository at this point
Copy the full SHA c3c76cbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4829168 - Browse repository at this point
Copy the full SHA 4829168View commit details -
Configuration menu - View commit details
-
Copy full SHA for fa3927d - Browse repository at this point
Copy the full SHA fa3927dView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for d707561 - Browse repository at this point
Copy the full SHA d707561View commit details -
Configuration menu - View commit details
-
Copy full SHA for 94626dc - Browse repository at this point
Copy the full SHA 94626dcView commit details -
Configuration menu - View commit details
-
Copy full SHA for dc9293d - Browse repository at this point
Copy the full SHA dc9293dView commit details -
Configuration menu - View commit details
-
Copy full SHA for a984a97 - Browse repository at this point
Copy the full SHA a984a97View commit details -
Configuration menu - View commit details
-
Copy full SHA for fce5ff9 - Browse repository at this point
Copy the full SHA fce5ff9View commit details -
Configuration menu - View commit details
-
Copy full SHA for b9d7bc1 - Browse repository at this point
Copy the full SHA b9d7bc1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3811561 - Browse repository at this point
Copy the full SHA 3811561View commit details -
Configuration menu - View commit details
-
Copy full SHA for 00722e1 - Browse repository at this point
Copy the full SHA 00722e1View commit details -
Configuration menu - View commit details
-
Copy full SHA for ba86932 - Browse repository at this point
Copy the full SHA ba86932View commit details -
Populate table view with changes
- Initialized the change name column - Commented out 'getDialogPane().setContent(pane)' because it will be removed later
Configuration menu - View commit details
-
Copy full SHA for 1f908f6 - Browse repository at this point
Copy the full SHA 1f908f6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 71c2144 - Browse repository at this point
Copy the full SHA 71c2144View commit details -
Configuration menu - View commit details
-
Copy full SHA for 97a5f1d - Browse repository at this point
Copy the full SHA 97a5f1dView commit details -
Configuration menu - View commit details
-
Copy full SHA for bad443b - Browse repository at this point
Copy the full SHA bad443bView commit details -
Apply changes when before the dialog
- Changes are applied only when all changes are resolved (changes table is empty). Like a transaction
Configuration menu - View commit details
-
Copy full SHA for 3b31d58 - Browse repository at this point
Copy the full SHA 3b31d58View commit details -
Configuration menu - View commit details
-
Copy full SHA for 54daebb - Browse repository at this point
Copy the full SHA 54daebbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3e9cd28 - Browse repository at this point
Copy the full SHA 3e9cd28View commit details -
Configuration menu - View commit details
-
Copy full SHA for c5599b7 - Browse repository at this point
Copy the full SHA c5599b7View commit details -
Enable the 'Merge...' button only if the selected change has an advan…
…ced merge dialog
Configuration menu - View commit details
-
Copy full SHA for 16bb186 - Browse repository at this point
Copy the full SHA 16bb186View commit details -
Configuration menu - View commit details
-
Copy full SHA for 263aa60 - Browse repository at this point
Copy the full SHA 263aa60View commit details -
Configuration menu - View commit details
-
Copy full SHA for f0fbd87 - Browse repository at this point
Copy the full SHA f0fbd87View commit details -
Don't open the advanced merge dialog when 'makeChange()' is called on…
… 'EntryChangeViewModel'
Configuration menu - View commit details
-
Copy full SHA for 0d33e57 - Browse repository at this point
Copy the full SHA 0d33e57View commit details -
Configuration menu - View commit details
-
Copy full SHA for 358b235 - Browse repository at this point
Copy the full SHA 358b235View commit details -
Configuration menu - View commit details
-
Copy full SHA for 76f8849 - Browse repository at this point
Copy the full SHA 76f8849View commit details -
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 ...
Configuration menu - View commit details
-
Copy full SHA for 698b801 - Browse repository at this point
Copy the full SHA 698b801View commit details