-
-
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
Open office refactor finalization (formerly OObranch J cleanup) #7795
Conversation
# Conflicts: # src/main/resources/l10n/JabRef_en.properties
# Conflicts: # src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java # src/main/java/org/jabref/logic/openoffice/action/EditInsert.java # src/main/java/org/jabref/logic/openoffice/action/EditMerge.java # src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java # src/main/java/org/jabref/logic/openoffice/action/ExportCited.java # src/main/java/org/jabref/logic/openoffice/action/Update.java # src/main/resources/l10n/JabRef_en.properties
# Conflicts: # src/main/java/org/jabref/logic/openoffice/action/Update.java # src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java # src/main/resources/l10n/JabRef_en.properties # src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java # src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
# Conflicts: # src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
…ed-reformatted some comments
As @tobiasdiez suggested, I did not do an in deep code review, but only made changes to code style an tested it on my windows machine a bit. |
Co-authored-by: Christoph <siedlerkiller@gmail.com>
# Conflicts: # src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java # src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java # src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java # src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
* upstream/main: Update RemoteSetupTest.java, adding eq() function from mockito (#8561) readd encoding after merge Open office refactor finalization (formerly OObranch J cleanup) (#7795) Revert "Refine documentation (#8551)" (#8560) Refine documentation on logging (#8550) Revert "Refine documentation (#8551)" (#8559) Refine documentation (#8551) New Crowdin updates (#8557) New Crowdin updates (#8553) Fix missing metadata in BibDatabaseContext (#8556) Add encoding detection (and pin export to UTF-8) (#8506) Add Missing Fillers/Extractors for Supported Fields and Support Day Conversion (#8531) Bump checkstyle from 9.3 to 10.0 (#8544) Fix online link detection in entry editor (#8514) Add some JavaDoc to Fetchers Support two argument form of \abx@aux@cite macro in DefaultAuxParser (#8549)
@antalk2 Thank you so much for your contribution - and writing up documentation. I think, your text at https://github.com/JabRef/jabref/tree/main/docs/openoffice is a good start for new developers in case they want to work on this further (e.g., by adding CSL support; refs #2146). Your code will be part of the next release 🎉 |
Thank you guys for taking over the integration. Concerning #7861 and #7805 : I did not address these in the code, as far as I know they are not resolved. #7615 might work. It did at the time, but I was worried about the check taking too much time (#7615 (comment)) and I am not sure if I turned it off (probably did not). |
Cleanup unused stuff after integration. Adjust tests.
Fixes #8540 for me