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

Remove ampersand escape when writing to bib file #5869

Merged
merged 3 commits into from
Jan 25, 2020

Conversation

tobiasdiez
Copy link
Member

Instead use save action to handle this case. Hopefully fixes the last remaining issue in #4877.

Includes also a bit of refactoring (mostly renames).

Instead use save action to handle this case. Includes also a bit of refactoring (mostly renames).
@tobiasdiez tobiasdiez added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jan 25, 2020
Copy link
Member

@Siedlerchr Siedlerchr left a comment

Choose a reason for hiding this comment

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

Yeah! Looks good

@tobiasdiez tobiasdiez merged commit 0407d9a into master Jan 25, 2020
@tobiasdiez tobiasdiez deleted the removeAmpersandEscape branch January 25, 2020 16:48
Siedlerchr added a commit that referenced this pull request Jan 26, 2020
# By Carl Christian Snethlage (9) and others
# Via Carl Christian Snethlage (5) and GitHub (1)
* upstream/master:
  Fixed Test
  Refactored constructors, PreferencesService and some minor improvements.
  Remove ampersand escape when writing to bib file (#5869)
  Fix #5862. It was indeed the throttler (at least it is working now for me) (#5868)
  duplicate query parameter removed (#5865)
  Minor refactoring, and changed comment
  forgotten l10n resources
  Minor visual adjustments
  Removed description, fixed ok button and added some minor improvements
  Moved GroupDescription-stuff to proper class
  Added hintTextFlow, some rewording and changed the hierarchicalContext RadioButtons to a ComboBox
  Converted GroupDialog to mvvm pattern

# Conflicts:
#	src/main/resources/l10n/JabRef_en.properties
Siedlerchr added a commit that referenced this pull request Jan 30, 2020
* master: (297 commits)
  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)
  Switch to our IntelliJ config (#5881)
  Bump unirest-java from 3.4.00 to 3.4.01 (#5874)
  Bump junit-vintage-engine from 5.5.2 to 5.6.0 (#5875)
  Bump checkstyle from 8.28 to 8.29 (#5876)
  Bump junit-jupiter from 5.5.2 to 5.6.0 (#5877)
  Bump junit-platform-launcher from 1.5.2 to 1.6.0 (#5878)
  Change \ to /
  Bump byte-buddy-parent from 1.10.6 to 1.10.7 (#5873)
  Fix opening pdf with okular in linux (#5253) (#5855)
  Fixed Test
  Refactored constructors, PreferencesService and some minor improvements.
  Remove ampersand escape when writing to bib file (#5869)
  Fix #5862. It was indeed the throttler (at least it is working now for me) (#5868)
  duplicate query parameter removed (#5865)
  New Crowdin translations (#5864)
  Minor refactoring, and changed comment
  Bump antlr4 from 4.7.2 to 4.8-1 (#5852)
  Reintroducing master table index column (#5844)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

2 participants