Modify message at the duplicates found dialog #7231
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
|
I'll fix the tests. |
tobiasdiez
reviewed
Dec 23, 2020
src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
Outdated
Show resolved
Hide resolved
koppor
requested changes
Jan 4, 2021
src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
Outdated
Show resolved
Hide resolved
- In the duplicate dialog from ImportEntriesViewModel change the Auto merge text to Continue with importer - Change the text: "Disable this confirmation dialog" to: "Do not ask again" in all the project
koppor
approved these changes
Jan 18, 2021
Siedlerchr
added a commit
that referenced
this pull request
Jan 22, 2021
…dtask * upstream/master: Upgrade citeproc to 3.x snapshot without graal (#7370) Fix Exception if no AzureInstrumentationKey is available (#7373) Update snapcraft source url (#7372) Fix checkstyle and adjust language GitBook: [master] 3 pages and 32 assets modified Add migration to special field (#7368) GitBook: [master] 5 pages and 29 assets modified Modify message at the duplicates found dialog (#7231) Fixes miss-parsed names in `AutomaticPersonsGroup` (#7228) Fix an issue where the password for a shared SQL database was only remembered if it was the same as the username (#7364) Fix harvard exporter by changing AuthorsFormatter (#7355) Bump styfle/cancel-workflow-action from 0.6.0 to 0.7.0 (#7363) Bump mockito-core from 3.7.0 to 3.7.7 (#7360) Bump org.beryx.jlink from 2.23.1 to 2.23.2 (#7361) Bump libreoffice from 7.0.3 to 7.0.4 (#7362) Export full month name instead of number in ms office (#7358)
Siedlerchr
added a commit
to koppor/jabref
that referenced
this pull request
Jan 26, 2021
* upstream/master: (217 commits) Fix handling of URL in file field (JabRef#7347) Fix expansion of bracketed expressions in RegExpBasedFileFinder (JabRef#7338) Refactor unlinked files (JabRef#7209) Add pressing enter when the search field is focused as a way to trigger search (JabRef#7377) Upgrade citeproc to 3.x snapshot without graal (JabRef#7370) Fix Exception if no AzureInstrumentationKey is available (JabRef#7373) Update snapcraft source url (JabRef#7372) Fix checkstyle and adjust language GitBook: [master] 3 pages and 32 assets modified Add migration to special field (JabRef#7368) GitBook: [master] 5 pages and 29 assets modified Modify message at the duplicates found dialog (JabRef#7231) Fixes miss-parsed names in `AutomaticPersonsGroup` (JabRef#7228) Fix an issue where the password for a shared SQL database was only remembered if it was the same as the username (JabRef#7364) Fix harvard exporter by changing AuthorsFormatter (JabRef#7355) Bump styfle/cancel-workflow-action from 0.6.0 to 0.7.0 (JabRef#7363) Bump mockito-core from 3.7.0 to 3.7.7 (JabRef#7360) Bump org.beryx.jlink from 2.23.1 to 2.23.2 (JabRef#7361) Bump libreoffice from 7.0.3 to 7.0.4 (JabRef#7362) Export full month name instead of number in ms office (JabRef#7358) ... # Conflicts: # external-libraries.md # src/main/java/module-info.java # src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
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.
Summary
This pull request is to fix issue #6334 / Finding duplicates
The previous message at duplicates found dialog was not so descriptive as it is marked at the issue #6334
Changes
Modify ImportEntriesViewModel to show a more explicit message when a duplicate is found.
Demo