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.

Sign up for GitHub

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

Jump to bottom

Fix freezing on browse in protected terms dialog #3158

Merged
merged 2 commits into from
Aug 27, 2017
Merged

Fix freezing on browse in protected terms dialog #3158

merged 2 commits into from
Aug 27, 2017

Conversation

Siedlerchr
Copy link
Member

@Siedlerchr Siedlerchr commented Aug 25, 2017 •
edited
Loading

when adding from entrry editor

changed open file dialog to save file dialog
Fix #3157

  • Change in CHANGELOG.md described
  • Tests created for changes
  • Screenshots added (for bigger UI changes)
  • Manually tested changed features in running JabRef
  • Check documentation status (Issue created for outdated help page at help.jabref.org?)
  • If you changed the localization: Did you run gradle localizationUpdate?

@Siedlerchr
Fix freezing on browse in protected terms dialog when adding from ent…
7f55467 
…ry editor

changed open file dialog to save file dialog
Fix #3157
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into fixProtectTermsfr…
b1e4f8a 
…eeze

* upstream/master:
  .jar are not ignored any more (#3155)
  Increase size of file and keywords editors (#3141)

# Conflicts:
#	CHANGELOG.md
@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Aug 25, 2017
LinusDietz
LinusDietz approved these changes Aug 27, 2017
View reviewed changes
Copy link
Member

@LinusDietz LinusDietz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lenhard
Copy link
Member

lenhard commented Aug 27, 2017

Tested locally and works. Good job!

@lenhard lenhard merged commit 9b9cb46 into master Aug 27, 2017
@lenhard lenhard deleted the fixProtectTermsfreeze branch August 27, 2017 16:08
Siedlerchr added a commit that referenced this pull request Aug 27, 2017
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into exportPdf
26c4b2a 
* upstream/master:
  Add preference to disable validation in the entry editor by default (#3154)
  Fix freezing on browse in protected terms dialog when adding from entry editor (#3158)
  Close entry editor when the shown entry is removed externally (#3156)
  .jar are not ignored any more (#3155)
  Increase size of file and keywords editors (#3141)
  Make Replace Strings work in bibtexkeyfield
  Fix errorprone (#3151)
  Fix display of percentage symbol in entry preview (#3149)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LinusDietz LinusDietz LinusDietz approved these changes

Assignees
No one assigned
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Siedlerchr @lenhard @LinusDietz