Fix typo
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
minor changes for #4657
fix #4657
show error message for widget is disposed dialog
Updated version in pom / project files to taxeditor version : 4.0.0-SNAPSHOT and cdmlib version : 4.0.0-SNAPSHOT
Fix build properties and classpath
Made molecular plugin optional
classpath updates
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
Remove unused extension points
Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT
#5209 Beautify error messages related to connection / access to remote server
Revert update handler to earlier version
Move to simpler update process
Add repo URIs to update operation
Remove eclipse env check
Simplify update process
Correct update operation initialisation
Add info dialog when no updates available
Move update checks from P2Util to UpdateHandler
Remove unused classpath entry
#4073 Add new project for lanuching embedded jetty server using cdmlib webapp
#4073 Add jetty server dependencies
#4073 Add stop start possibility for server
#4073 Add functionality to control managed server in login dialog
#4073 Add start / stop methods for managed server...
Update eclipse compile / runtime to JavaSE-1.7
Conflicts: eu.etaxonomy.taxeditor.application/.classpath
Removed OccurrenceView
Disable menu items when not connected to CDM store (#4901)
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
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
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.
Update operation for move taxon nodes
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...
Conflicts: eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
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...
Fix application ID
Correct config for molecular plugin
#5029 Add login info to application title bar
#5029 Add functionality for login to remember credentials, reconnect and switch user
#5061 Add force refresh of p2 repositories before checking for updates
Correct issues from last merge
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
updating poms for branch'release/3.7.0' with non-snapshot versions
Revert project versions to 3.7.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0
Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
updating poms for 3.8.0-SNAPSHOT development
Add method to sessionOwner objects to fine tune performance using property paths
Fix merge commit
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
#5054 Integrate remoting session in Term Editor
This commit also fixes a loading bug in the CdmServiceCacher, adds a test for creating term vocabulary and adapts to the change in the save call (#5056)
Conflicts: eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java...
add empty test folder
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/.gitignore eu.etaxonomy.taxeditor.cdmlib/pom.xml eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java...
add empty folder
fixed classpath issues and issues from last merge
fixed manifest versions
updating poms for branch'hotfix/3.6.1' with non-snapshot versions
updating poms for branch '3.6.1' with snapshot versions
Release 3.6.0 merge
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: .gitattributes eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...