Consider dev tag in version comparison#2312
Merged
Merged
Conversation
tobiasdiez
approved these changes
Nov 24, 2016
tobiasdiez
left a comment
Member
There was a problem hiding this comment.
LGTM. I think its worth a changelog entry and can be merged afterwards.
Siedlerchr
added a commit
that referenced
this pull request
Nov 27, 2016
* upstream/master: (36 commits) Rework DBLPFetcher to new structure (#2314) Consider dev tag in version comparison (#2312) Update diffutils from 1.3.0 to 2.1.1 Replace usages of Throwable with Exception (#2310) Add missing srcDir statement improve documentation of save order limitation - see #2305 Adapt CSL tests to CRLF and LF (#2306) Use SPDX license identifiers Add key format of #2275 as requirement to CONTRIBUTING.md Add fallback exception handler (#2287) Update citeproc dependency to 1.0.1 (#2303) Remove duplicate code getResolvedFieldOrAlias (#2296) Update testCompile dependencies (mockito-core, wiremock) Change execution order (#2302) Use https for files.jabref.org Use compileJava instead of getdeps to decrease build time even more Update install4j from 6.1.1 to 6.1.3 Fix local metadata synchronization Fix NullPointerException in ConnectToSharedDatabaseDialog (#2297) The error message "No suitable driver found" will not appear when JabRef connects on startup. (#2295) ... # Conflicts: # src/main/java/net/sf/jabref/logic/util/io/FileUtil.java
Siedlerchr
added a commit
that referenced
this pull request
Nov 28, 2016
…ntentSelector * 'master' of https://github.com/Siedlerchr/jabref: Rework DBLPFetcher to new structure (#2314) Consider dev tag in version comparison (#2312) Update diffutils from 1.3.0 to 2.1.1 Replace usages of Throwable with Exception (#2310) Add missing srcDir statement improve documentation of save order limitation - see #2305 Adapt CSL tests to CRLF and LF (#2306) Use SPDX license identifiers Add key format of #2275 as requirement to CONTRIBUTING.md Add fallback exception handler (#2287) Update citeproc dependency to 1.0.1 (#2303) Remove duplicate code getResolvedFieldOrAlias (#2296) Update testCompile dependencies (mockito-core, wiremock) Change execution order (#2302) Use https for files.jabref.org Use compileJava instead of getdeps to decrease build time even more Update install4j from 6.1.1 to 6.1.3 Fix local metadata synchronization
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes: #2298
The version check now considers the dev tag.