-
-
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 fix-8010
* upstream/main: (101 commits) Fixed tests by reverting development artifact Fixed checkstyle Fixed test remove empty lines move to entry editor prefs Reduced use of Globals for fileUpdateMonitor, removed unused themeManager vars reformulate Update src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java fix checkstyle Modernize tests at BibtexParserTest Removed ImportFormatReader from Globals at all Fixes some JavaDoc errors Add newline Really fix order Fix CHANGELOG.md order Fix checkstyle Update CHANGELOG.md move to entry editor editor tab add javadoc checkstyle ... # Conflicts: # CHANGELOG.md # src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
- Loading branch information
Showing
268 changed files
with
2,937 additions
and
3,023 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
Oops, something went wrong.