Merge branch 'master' into save-actions-gui

Conflicts:
	src/main/java/net/sf/jabref/gui/dbproperties/DatabasePropertiesDialog.java

CHANGELOG.md

@@ -26,7 +26,9 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 - Moved all quality-related database actions inside a new quality menu
 - [#684](https://github.com/JabRef/jabref/issues/684): ISBNtoBibTex Error Message is now more clear
 - Moved default bibliography mode to general preferences tab
+- Added Ordinal formatter (1 -> 1st etc)
 
+- [#492](https://github.com/JabRef/jabref/issues/492): If no text is marked, the whole field is copied. Preview of pasted text in tool tip
 
 ### Fixed
 - Fixed [#621](https://github.com/JabRef/jabref/issues/621) and [#669](https://github.com/JabRef/jabref/issues/669): Encoding and preamble now end with newline.
@@ -48,6 +50,7 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 - Fixed [#743](https://github.com/JabRef/jabref/issues/743): Logger not configured when JAR is started
 - Fixed [#822](https://github.com/JabRef/jabref/issues/822):OSX - Exception when adding the icon to the dock
 
+- Fixed [#685](https://github.com/JabRef/jabref/issues/685): Fixed MySQL exporting for more than one entry
 
 ### Removed
 - Fixed [#627](https://github.com/JabRef/jabref/issues/627): The pdf field is removed from the export formats, use the file field

CONTRIBUTING.md

@@ -18,10 +18,7 @@ Nevertheless we aim to keep the code consistently formatted, therefore we additi
 
 ### Ensure consistent formatting
 Ensure your code is formatted according the JabRef formatting guidelines.
-These are provided as Eclipse formatting configuration in [formatter_settings.xml](ide-settings/formatter_settings.xml).
-Ensure that JabRef's code cleanup settings are activated.
-Import [cleanup_settings.xml](ide-settings/cleanup_settings.xml).
-When you use Eclipse, the required config is generated automatically by `gradlew eclipse`.
+When you use Eclipse, the required configuration is generated automatically by `gradlew cleanEclipse eclipse`.
 You can also run `gradlew format` to let the [Gradle Format plugin](https://github.com/youribonnaffe/gradle-format-plugin) do the formatting.
 
 

README.md

@@ -8,6 +8,7 @@
 [![Download JabRef](https://img.shields.io/sourceforge/dw/jabref.svg)](http://sourceforge.net/projects/jabref/files/)
 [![Issue Stats](http://www.issuestats.com/github/jabref/jabref/badge/pr)](http://www.issuestats.com/github/jabref/jabref)
 [![Issue Stats](http://www.issuestats.com/github/jabref/jabref/badge/issue)](http://www.issuestats.com/github/jabref/jabref)
+[![Codacy Badge](https://api.codacy.com/project/badge/grade/327430c894e04086a5bfef618fa44f36)](https://www.codacy.com/app/simonharrer/jabref)
 
 This version is a development version. Features may not work as expected.
 

build.gradle

@@ -54,7 +54,7 @@ install4j {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.10'
+    gradleVersion = '2.11'
 }
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
-#Tue Dec 29 09:51:10 CET 2015
+#Sat Feb 20 18:40:58 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 #`-all` is used instead of `-bin` to enable `build.gradle` editing support within IntelliJ IDEA
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip

gradlew.bat

@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args