cdmlibcdm-dataportalcdm-servercdm-vaadincdm-webappcdmlib-appsserver-scriptstaxeditortaxongraph-viewutis-clientutis-coreutis-webapp
Merge branch 'develop' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/build.properties
Updated version in pom / project files to taxeditor version : 3.10.0-SNAPSHOT and cdmlib version : 3.10.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
Revert "Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT"
This reverts commit 7ed2ce1e9eca6a9dd72c740e72efdcd6ef1135c9.
#5029 Add functionality for login to remember credentials, reconnect and switch user
Conflicts: eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF...
Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0
View revisions
Also available in: Atom