ref #7079, #7076 Add nebula composite table as update site dependency
ref #7079 Remove filter for update site
Remove e4 spy features from rcp.target contents
Remove e4 spies from rcp.target
Updated version in pom / project files to taxeditor version : 4.14.0-SNAPSHOT and cdmlib version : 4.14.0-SNAPSHOT
Merge branch 'develop' into wset
merge master into develop
Updated version in pom / project files to taxeditor version : 4.13.0-SNAPSHOT and cdmlib version : 4.13.0-SNAPSHOT
Implement character matrix
ref #7090 Add nattable to rcp.target
Updated version in pom / project files to taxeditor version : 4.11.4 and cdmlib version : 4.11.0
Updated version in pom / project files to taxeditor version : 4.11.3 and cdmlib version : 4.11.0
ref #7076 Add Nebula CompositeTable as direct dependency
Updated version in pom / project files to taxeditor version : 4.11.2 and cdmlib version : 4.11.0
remove nebula.tablecombo from rcp.target
minor
merge hotfix4.11.1 into develop
Updated version in pom / project files to taxeditor version : 4.11.1 and cdmlib version : 4.11.0
Updated version in pom / project files to taxeditor version : 4.12.0-SNAPSHOT and cdmlib version : 4.12.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 4.11.0 and cdmlib version : 4.11.0
Updated version in pom / project files to taxeditor version : 4.11.0-SNAPSHOT and cdmlib version : 4.11.0-SNAPSHOT
add nebula richtext to target plattform
ref #6781 Replace nebula update site with 2016 archived one
Updated version in pom / project files to taxeditor version : 4.10.0-SNAPSHOT and cdmlib version : 4.10.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 4.9.0-SNAPSHOT and cdmlib version : 4.9.0-SNAPSHOT
fixed rcp target
Update name of target platform to "neon"
Merge branch 'develop' into derivateView
Updated version in pom / project files to taxeditor version : 4.8.0-SNAPSHOT and cdmlib version : 4.8.0-SNAPSHOT
ref #6566 Migrate "Add Tissue Sample" menu item
Remove dev-only program argument
ref #6566 Add launch option to avoid application model caching
ref #6539 Streamline dependencies
ref #6539 Remove unused dependencies from target platform and feature
ref #6539 Remove linuxtools from target platform
ref #6539 Move to Eclipse 4 compatibility layer
ref #6539 Fix build problems
Updated version in pom / project files to taxeditor version : 4.7.0-SNAPSHOT and cdmlib version : 4.7.0-SNAPSHOT
Revert "removing all .classpath and .project files"
This reverts commit c02ad176b4c6452b302560e254f319b7260cd6d8.
Revert "Add .project files"
This reverts commit 7b5184094bda79a0c13e879907eaaafe3b7561b2.
Add .project files
ref #6401 Remove maxPermSize argument (not supported anymore in jdk1.8)
removing all .classpath and .project files
ref #6401 Update taxeditor workspace plugins to java 8
manually set version numbers
manually setting the project and cdmlib version to 4.6.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 4.5.1 and cdmlib version : 4.5.1
Updated version in pom / project files to taxeditor version : 4.5.0 and cdmlib version : 4.5.0
Merge branch 'develop' into LibrAlign
Updated version in pom / project files to taxeditor version : 4.5.0-SNAPSHOT and cdmlib version : 4.5.0-SNAPSHOT
Merge branch 'LibrAlign' of https://dev.e-taxonomy.eu/git/taxeditor into LibrAlign
Plugin molecular.lib refactored to use direct project dependencies. This should not be merged into trunk, since this is only for development state. (Currently the trunk is anyway already using different Maven dependencies.) Adjustments to recent changes in JPhyloIO.
Updated version in pom / project files to taxeditor version : 4.4.0-SNAPSHOT and cdmlib version : 4.4.0-SNAPSHOT
Fix repository location for target platform
Updated version in pom / project files to taxeditor version : 4.3.0-SNAPSHOT and cdmlib version : 4.3.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 4.2.0-SNAPSHOT and cdmlib version : 4.2.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 4.1.0-SNAPSHOT and cdmlib version : 4.1.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 4.0.0-SNAPSHOT and cdmlib version : 4.0.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT
Fix product version for jre product definition
Revert update handler to earlier version
Update eclipse compile / runtime to JavaSE-1.7
Conflicts: eu.etaxonomy.taxeditor.application/.classpath
Revert "Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT"
This reverts commit 9524fa3910c8335a6cbcb656f9aacaca01a3f5ca.
Fix versions
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 eu.etaxonomy.taxeditor.cdmlib/pom.xml
Revert project versions to 3.11.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 3.12.0-SNAPSHOT and cdmlib version : 3.12.0-SNAPSHOT
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/build.properties
updating poms for 3.11.0-SNAPSHOT development
Revert project versions to 3.10.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 3.11.0-SNAPSHOT and cdmlib version : 3.11.0-SNAPSHOT
updating poms for 3.10.0-SNAPSHOT development
Revert project versions to 3.9.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 3.10.0-SNAPSHOT and cdmlib version : 3.10.0-SNAPSHOT
Correct version
updating poms for 3.9.0-SNAPSHOT development
Revert project versions to 3.8.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.
Revert "Revert project versions to 3.8.0-SNAPSHOT"
This reverts commit e8268306693f047beef36ce53524adc00946cf74.
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.editor/plugin.xml eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java...
Add PDE runtime environment to target platform (provides Plug-In Spy)
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java...
#4717 Correct java exec called for macosx
#4717 Correct macosx java path
#4717 Correct dir relative path to java exec for mac osx
#4717 Add seperate product file for jre bundle
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
Updating develop poms back to pre merge state