Removed OccurrenceView
Fix typo
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...
Updated version in config files to 3.6.1-SNAPSHOT
Updated version in config files to 3.6.0
DefinedTermDropAdapter : added selection of source objects after drop and disabled insert feedback for non OrderedTermBase objects DefinedTermEditor : added custom sorter for OrderedTermBase (descending) MoveDefinedTermOperation : added possibility to move term when cursor is in the insert part of the list
Merge branch 'move-to-luna' 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 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml...
dependency changes to move to e4
revert message handling for ApplicationWorkbencAdvisor #4657
Updated version in config files to 3.5.2-SNAPSHOT
Updated version in config files to 3.5.1
widget is disposed exception ticket (#4657)
fixing i18n problem in build.properties
Some changes on TaxEditor i18n: #4553
fix NPE in messaging handling #4816
eu.etaxonomy.taxeditor.product.with.jre : removed since the jre bundling is done on jenkins ApplicationUtil : added UTC to beta version string eu.etaxonomy.taxeditor.cdmlib/pom.xml : fixes problem with clean validate - ticket #4733
Updated version in config files to 3.5.1-SNAPSHOT
Updated version in config files to 3.5.0
update Manifest from 3.4.1 -> 3.5.0
update taxeditor version from 3.4.1 to 3.5.0
wrong target revision in the last commit
reverting back wrongly committed files
Updated version in config files to 3.4.1-SNAPSHOT
Updated version in config files to 3.4.0
merge from trunk