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 ignore version #2055

Merged
merged 1 commit into from
Sep 24, 2016
Merged

Fix ignore version #2055

merged 1 commit into from
Sep 24, 2016

Conversation

chriba
Copy link
Contributor

@chriba chriba commented Sep 24, 2016

Fixes #2054

Made a rookie mistake and ignored the already ignored version again.
Reworked the preferences to the new design.

Siedlerchr
Siedlerchr approved these changes Sep 24, 2016
View reviewed changes
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.

Looks good to me. When tests are green we can mergei t

@chriba
Copy link
Contributor Author

chriba commented Sep 24, 2016

The only test that failed is the getByDoi test from the springer service.
Not surprising since the Springer service is currently down for maintenance.

@Siedlerchr Siedlerchr merged commit 50da306 into JabRef:master Sep 24, 2016
@Siedlerchr
Copy link
Member

Okay, I merged it in!

@chriba chriba deleted the fixIgnoreVersion branch September 24, 2016 19:17
Siedlerchr added a commit that referenced this pull request Sep 25, 2016
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into medlineutf8
95f7f84 
* upstream/master:
  Implemented Integrity NoBibtexFieldChecker (#2059)
  Implemented title and camel key modifiers (#1894)
  Fix localization task hints (#2031)
  Result of syncLang.py update
  Result of syncLang.py update (with manual correction of captial_letters, and The_BibTeX_entry...)
  Fix "large capitals" to "capital letters"
  Updated Menu_tr.properties (#2057)
  Updated jabref_tr.properties (#2056)
  fix ignore version (#2055)
  Towards hierarchical keywords (#1950)
  Fix failing test, replace \uxxx encoded chars with proper UTF8 chars.
  Import Italian patch
zesaro pushed a commit to zesaro/jabref that referenced this pull request Nov 22, 2016
@chriba @zesaro
fix ignore version (JabRef#2055)
c5d6b32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Siedlerchr Siedlerchr Siedlerchr 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.
2 participants
@chriba @Siedlerchr