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.
Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT
#5309, #5310 Add load method to retrieve user entity after create and password change
Update root entity merge calls to use new merge method.
improve messaging for deleteresults
improve messaging for deleteResult
#5282 Integrate remoting in referencing objects view
Add remoting checks for merge, Move to merge call which returns updated transient object
minor
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
#5242, #5223 Improve performance of derivate loading and editing
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.
Cleanup unused code
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...
better messaging when convert person to team does not work
moving more than one taxon node, merge of team and person, reusing name for new taxon
#5161 Fix problem of new entity not refreshed
fix #5171
Conflicts: eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
Disable MediaView for bulk editor (#5162)
#5160 Use new merge method with ids as arguments
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...
Trim code
Remove comments
fix delete polytomouskeynode and improve merge in bulk editor
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
changes for #4908
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
updating poms for 3.8.0-SNAPSHOT development
Add method to sessionOwner objects to fine tune performance using property paths
Conflicts: eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
Fix merge commit
Update ICdmEntitySessionEnabled to no longer extend ICdmChangeListener
Make cell text in ReferencingObjectsView selectable
Make editor compatible with latest cdmlib service layer updates
#5012 Adding remoting session and updating save methods for Bulk Editor
Replace properties file with xml file
#5012 updates for making Bulk Editor remoting capable
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
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...
all delete methods need an Uuid as argument
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java...
change delete argument to UUID
ICdmDataChangeService, CdmUIDataChangeService, CdmDataChangeService : added new data change service with different services for the ui and non-ui states CdmApplicationState, CdmStore : added data change service to app state CdmChangeEvent, ICdmChangeListener : added change listener and even to fire in case of data changes...
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
Updated version in config files to 3.6.1-SNAPSHOT
Updated version in config files to 3.6.0
new session for every search in bulk editor
Renaming menu labels for new team and person