Fix external group metadata changes are not merged#8994
Merged
Conversation
This reverts commit d71f93a.
- original and new group root are switched in the test too
Siedlerchr
approved these changes
Jul 24, 2022
calixtus
approved these changes
Jul 25, 2022
Member
|
THX! |
2 tasks
Siedlerchr
added a commit
that referenced
this pull request
Aug 3, 2022
* upstream/main: (21 commits) New Crowdin updates (#9016) New Crowdin updates (#9013) try to gather more output from LO exception (#9002) Improve Automatic Field Editor Dialog (#8973) Update BST VM to Antlr4 (#8934) Support biblatex apa citation for legal entry types (#8966) Bump junit-jupiter from 5.8.2 to 5.9.0 (#9012) Bump lucene-core from 9.2.0 to 9.3.0 (#9009) Bump checkstyle from 10.3.1 to 10.3.2 (#9006) Bump appleboy/ssh-action from 0.1.4 to 0.1.5 (#9005) New translations JabRef_en.properties (Spanish) (#9003) Squashed 'buildres/csl/csl-locales/' changes from 55459cd79f..e637746677 Squashed 'buildres/csl/csl-styles/' changes from 3d3573c..c750b6e Autosave folder and checkbox is remembered (#9000) New Crowdin updates (#8999) Sync group view mode and main table (#8993) Bump unoloader from 7.3.4 to 7.3.5 (#8996) Bump libreoffice from 7.3.4 to 7.3.5 (#8997) Bump java-diff-utils from 4.11 to 4.12 (#8998) Fix external group metadata changes are not merged (#8994) ...
Siedlerchr
added a commit
that referenced
this pull request
Aug 3, 2022
* upstream/main: (39 commits) New Crowdin updates (#9016) New Crowdin updates (#9013) try to gather more output from LO exception (#9002) Improve Automatic Field Editor Dialog (#8973) Update BST VM to Antlr4 (#8934) Support biblatex apa citation for legal entry types (#8966) Bump junit-jupiter from 5.8.2 to 5.9.0 (#9012) Bump lucene-core from 9.2.0 to 9.3.0 (#9009) Bump checkstyle from 10.3.1 to 10.3.2 (#9006) Bump appleboy/ssh-action from 0.1.4 to 0.1.5 (#9005) New translations JabRef_en.properties (Spanish) (#9003) Squashed 'buildres/csl/csl-locales/' changes from 55459cd79f..e637746677 Squashed 'buildres/csl/csl-styles/' changes from 3d3573c..c750b6e Autosave folder and checkbox is remembered (#9000) New Crowdin updates (#8999) Sync group view mode and main table (#8993) Bump unoloader from 7.3.4 to 7.3.5 (#8996) Bump libreoffice from 7.3.4 to 7.3.5 (#8997) Bump java-diff-utils from 4.11 to 4.12 (#8998) Fix external group metadata changes are not merged (#8994) ...
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.
Fixes #8873
CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)