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

Conversation

HoussemNasri
Copy link
Member

Contributes to #6190

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

calixtus and others added 30 commits July 18, 2022 21:13
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>
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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
e637746677 copied .github/workflows/merge.yaml from styles

git-subtree-dir: buildres/csl/csl-locales
git-subtree-split: e637746677fd1f600173e07b561f0388284ae39b
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>
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>
* 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>
* 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>
Co-authored-by: Siedlerchr <siedlerkiller@gmail.com>
* 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>
* 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)
HoussemNasri and others added 26 commits August 3, 2022 20:21
- Removed FieldNameCellFactory.java and MergeableFieldCell.java
- Made it easier to add more side buttons in the future
- Initialized the change name column
- Commented out 'getDialogPane().setContent(pane)' because it will be removed later
- Changes are applied only when all changes are resolved (changes table is empty). Like a transaction
… 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 Siedlerchr merged commit 6178ccb into GSOC-merge-fields Aug 3, 2022
@Siedlerchr Siedlerchr deleted the GSOC-improve-collab-dialog branch August 3, 2022 18:31
@Siedlerchr Siedlerchr restored the GSOC-improve-collab-dialog branch August 3, 2022 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants