Keep UTF-8 encoding header if present#8964
Merged
Merged
Conversation
Co-authored-by: Christoph <siedlerkiller@gmail.com> Co-authored-by: ThiloteE <73715071+ThiloteE@users.noreply.github.com>
Siedlerchr
approved these changes
Jul 9, 2022
calixtus
approved these changes
Jul 9, 2022
Siedlerchr
added a commit
that referenced
this pull request
Jul 10, 2022
* upstream/main: Keep UTF-8 encoding header if present (#8964) Cleanup index when opening a library (#8962) Refactor context menu entry types changing (#8957) Improvement on check for missing commas when importing or opening a .bib file (#8840) # Conflicts: # src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
Siedlerchr
added a commit
that referenced
this pull request
Jul 14, 2022
…failure-dialog * upstream/main: (76 commits) New Crowdin updates (#8972) New Crowdin updates (#8969) Fix .bat errorlevel handling with pwsh.exe check (#8965) revert jsoup version upgrade Fix charset detection with utf16 and others (#8947) Bump classgraph from 4.8.147 to 4.8.149 (#8968) Bump jsoup from 1.15.1 to 1.15.2 (#8967) Keep UTF-8 encoding header if present (#8964) Cleanup index when opening a library (#8962) Refactor context menu entry types changing (#8957) Improvement on check for missing commas when importing or opening a .bib file (#8840) Disable ResearchGateTest on CI (#8955) Bump checkstyle from 10.1 to 10.3.1 (#8950) Bump checkstyle from 10.1 to 10.3.1 (#8950) Bump mariadb-java-client from 2.7.5 to 2.7.6 (#8953) Add notification when adding previous entries to new group configuration (#8919) Remember Sidepane width after restart (#8936) move "Warn about duplicates on import" preferences option (#8937) Fix theme switching exception (#8939) fix merge conflict ... # Conflicts: # src/main/resources/l10n/JabRef_en.properties
Siedlerchr
added a commit
to LIM0000/jabref
that referenced
this pull request
Jul 15, 2022
* upstream/main: (28 commits) [Bot] Update CSL styles (JabRef#8978) New Crowdin updates (JabRef#8972) New Crowdin updates (JabRef#8969) Fix .bat errorlevel handling with pwsh.exe check (JabRef#8965) revert jsoup version upgrade Fix charset detection with utf16 and others (JabRef#8947) Bump classgraph from 4.8.147 to 4.8.149 (JabRef#8968) Bump jsoup from 1.15.1 to 1.15.2 (JabRef#8967) Keep UTF-8 encoding header if present (JabRef#8964) Cleanup index when opening a library (JabRef#8962) Refactor context menu entry types changing (JabRef#8957) Improvement on check for missing commas when importing or opening a .bib file (JabRef#8840) Disable ResearchGateTest on CI (JabRef#8955) Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950) Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950) Bump mariadb-java-client from 2.7.5 to 2.7.6 (JabRef#8953) Add notification when adding previous entries to new group configuration (JabRef#8919) Remember Sidepane width after restart (JabRef#8936) move "Warn about duplicates on import" preferences option (JabRef#8937) Fix theme switching exception (JabRef#8939) ... # Conflicts: # src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Based on the forum post https://discourse.jabref.org/t/encoding-utf-8-not-in-bib-file/3438?u=koppor.
We should keep the header if it is in the file, because
The deletion "feature" was introduced at #8506.
CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)