Fix properly resolves OrFields of required fields #5903
Merged
Conversation
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
… tab "Required fields" of the entry editor
systemoperator
changed the title
systemoperator
changed the title
systemoperator
changed the title
|
Please resolve the conflicts and fix the checkstyle issue than we can merge |
Siedlerchr
approved these changes
Feb 2, 2020
|
@Siedlerchr Is there still something I need to do? Which checkstyle issue do you mean? |
|
See https://github.com/JabRef/jabref/pull/5903/checks?check_run_id=422021255 |
Siedlerchr
added a commit
that referenced
this pull request
Feb 3, 2020
* upstream/master: reference to issue added (#5911) Fix properly resolves OrFields of required fields (#5903) IDE setup updated and extended (#5901) Squashed 'src/main/resources/csl-styles/' changes from e71363e..c531528 Fixes problems with managing external file types (issue 5846) (#5894) Squashed 'src/main/resources/csl-locales/' changes from 41da445acc..4fa753374e Squashed 'src/main/resources/csl-styles/' changes from f0c7374..e71363e Update development-strategy.md
Siedlerchr
added a commit
that referenced
this pull request
Feb 3, 2020
* master: reference to issue added (#5911) Fix properly resolves OrFields of required fields (#5903) IDE setup updated and extended (#5901) Squashed 'src/main/resources/csl-styles/' changes from e71363e..c531528 Fixes problems with managing external file types (issue 5846) (#5894) Squashed 'src/main/resources/csl-locales/' changes from 41da445acc..4fa753374e Squashed 'src/main/resources/csl-styles/' changes from f0c7374..e71363e Update development-strategy.md Replace link to Workspace set-up with new one (#5896) Fixes making paths of linked files relative (web urls will not be touched anymore) (#5879)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Addresses: #5859 and partially #5853
This fix adds all entries of OrFields of the required fields of EntryTypeDefinitions to the list of required fields for the tab "Required fields" of the entry editor.