Skip to content
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

Rename 'Close' to 'Cancel' in the External Changes Resolver dialog #9130

Merged
merged 1 commit into from
Sep 3, 2022

Conversation

HoussemNasri
Copy link
Member

@HoussemNasri HoussemNasri commented Sep 3, 2022

Using 'Cancel' is more accurate since closing the dialog will cancel any resolved changes.

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Sep 3, 2022
@koppor koppor merged commit 416ba16 into main Sep 3, 2022
@koppor koppor deleted the use-cancel-instead-of-close branch September 3, 2022 23:49
Siedlerchr added a commit that referenced this pull request Sep 4, 2022
* upstream/main:
  Fix link and remove obsolete FAQ
  Rename 'Close' to 'Cancel' in the External Changes Resolver dialog (#9130)
  Tiny rephrasing
  Linked files with an absolute path can be opened again (#9129)
  Oberservable Preferences M (CleanupPreferences) (#9126)
  fix broken link
  Fix broken link
  Fix old JabRef linked files containing the file directory as element in the filename (#9046)
  PDFs are not stored next to .bib file if file directory is configured (#9113)
  Remove double stateManager.activeDatabaseProperty() (#9127)
  Don't show the info button when the authors field content is identical (#9128)
Siedlerchr added a commit to LIM0000/jabref that referenced this pull request Sep 4, 2022
* upstream/main: (111 commits)
  Fix link and remove obsolete FAQ
  Rename 'Close' to 'Cancel' in the External Changes Resolver dialog (JabRef#9130)
  Tiny rephrasing
  Linked files with an absolute path can be opened again (JabRef#9129)
  Oberservable Preferences M (CleanupPreferences) (JabRef#9126)
  fix broken link
  Fix broken link
  Fix old JabRef linked files containing the file directory as element in the filename (JabRef#9046)
  PDFs are not stored next to .bib file if file directory is configured (JabRef#9113)
  Remove double stateManager.activeDatabaseProperty() (JabRef#9127)
  Don't show the info button when the authors field content is identical (JabRef#9128)
  "study.yml" is static now (JabRef#9125)
  fix l10n
  Compile fix
  Fix parsing of JabRef v5.7 study.yml files (JabRef#9124)
  Fix integrity check  for tilde accents in author names (JabRef#9097)
  Rework the Define study parameters dialog (JabRef#9123)
  Fix parsing of save actions (JabRef#9122)
  Fix exception that occurs when saving name formatters (JabRef#9121)
  Refine code for BibEntry#replaceDownloadedFile (JabRef#9118)
  ...
@calixtus calixtus added the jabcon label Sep 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jabcon status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants