-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into checkKeygenOverwrite
* upstream/main: (104 commits) update test getPart (#8610) Add ControlHelper truncateString tests comments (#8612) Allow using custom SSL certificates (#8583) Fix protectedTerms not stored due to weaklistener (#8609) Fix changelog and version parsing (#8578) Creating more unit tests for NumericFieldComparatorTest (#8604) Fix merge entries dialog exceeding screen size (#8599) StringUtilTest new test for method GetPart (#8594) Use unkown entry type Add semantic scholar (#8575) Add research gate (#8580) fix import of unlinked files (#8444) (#8582) Missed l10n for fetcher fix (#8597) Fix some fetcher test (#8595) Bump slf4j-api from 2.0.0-alpha6 to 2.0.0-alpha7 in /buildSrc (#8589) Bump ikonli-materialdesign2-pack from 12.3.0 to 12.3.1 (#8591) Bump gittools/actions from 0.9.11 to 0.9.13 (#8587) Bump mockito-core from 4.3.1 to 4.4.0 (#8588) Bump flowless from 0.6.8 to 0.6.9 (#8590) Bump ikonli-javafx from 12.3.0 to 12.3.1 (#8592) ... # Conflicts: # src/main/java/org/jabref/gui/EntryTypeViewModel.java
- Loading branch information
Showing
459 changed files
with
19,230 additions
and
7,792 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.