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 convert to bibtex moves contents of the file field #4123

Merged
merged 3 commits into from
Jun 13, 2018
Merged

Fix convert to bibtex moves contents of the file field #4123

merged 3 commits into from
Jun 13, 2018

Conversation

Siedlerchr
Copy link
Member

@Siedlerchr Siedlerchr commented Jun 12, 2018 •
edited
Loading

Fixes #4120

  • Change in CHANGELOG.md described
  • Tests created for changes
  • Manually tested changed features in running JabRef
  • Screenshots added in PR description (for bigger UI changes)
  • Ensured that the git commit message is a good one
  • Check documentation status (Issue created for outdated help page at help.jabref.org?)

tobiasdiez
tobiasdiez approved these changes Jun 12, 2018
View reviewed changes
Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

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

With this fix, probably the "Convert to Biblatex" cleanup no longer moves the content of the PDF field to the file field. However, this is probably acceptable since we have the "upgrade pdf file" cleanup that does exactly this.

@Siedlerchr
Copy link
Member Author

Yep that was my thought, too

@stefan-kolb stefan-kolb merged commit 0ae7269 into master Jun 13, 2018
@stefan-kolb stefan-kolb deleted the fixfilefieldtopdfbibtexconverter branch June 13, 2018 06:23
Siedlerchr added a commit that referenced this pull request Jun 13, 2018
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into fixentrypreviewco…
7e71094 
…mments

* upstream/master:
  Extract v4.x changelog (#4125)
  Saves and reloads window state on close and on open (#4124)
  Fix convert to bibtex moves contents of the file field (#4123)
Siedlerchr added a commit that referenced this pull request Jun 13, 2018
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into leakedthread
3880225 
* upstream/master:
  Extract v4.x changelog (#4125)
  Saves and reloads window state on close and on open (#4124)
  Fix convert to bibtex moves contents of the file field (#4123)
  Opens the directory of the currently edited file when opening a new file (#4106)
  Show Citation style also in entry preview in preferences (#4121)
  Mac graphics (#4074)
  The textarea in the PersonsEditor is focused when the field is focused (#4112)
Siedlerchr added a commit that referenced this pull request Jun 15, 2018
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into fixdragandrop
95d0957 
* upstream/master: (22 commits)
  fix failing architecture test by making test class public again migrate architecture test to junit jupiter
  Fix build... (#4128)
  fix checkstyle after merge
  Migrate Review field in entry preview to comment (#4100)
  [WIP] Split push to applications in logic and gui (#4110)
  Fix checkstyle
  Fix #4115: Don't report journal name as abbreviated when full name = abbreviated name (#4116)
  Use <kbd>in changelog
  Groups right click (#4061)
  Fix open thread prevents shutdown (#4111)
  Extract v4.x changelog (#4125)
  Saves and reloads window state on close and on open (#4124)
  Fix convert to bibtex moves contents of the file field (#4123)
  Opens the directory of the currently edited file when opening a new file (#4106)
  Don't run on Swing thread
  Properly shutdown telemetry client
  Code cleanup
  Remove Swing stuff (L&F, font customization)
  Properly shutdown JabRef (not with System.exit)
  Replace swing clipboard with JavaFX one
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/BasePanel.java
#	src/main/java/org/jabref/gui/JabRefFrame.java
#	src/main/java/org/jabref/gui/maintable/MainTable.java
#	src/main/java/org/jabref/gui/search/SearchResultFrame.java
#	src/main/java/org/jabref/preferences/JabRefPreferences.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tobiasdiez tobiasdiez tobiasdiez approved these changes

@stefan-kolb stefan-kolb stefan-kolb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Siedlerchr @stefan-kolb @tobiasdiez