#5224 Using new cdmlib call for changing synonym to accepted taxon
Merge branch 'develop' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java...
Add unimplemented methods
#5213 Use method to move descriptions using uuids
Add annotation service to config
Trim code
Replace saveOrUpdate with merge
#5052 Integrate remoting in granted authorites editor
Fix new occurrence / sequence move method calls
Correct transient service method
#5187 Use new move methods with uuids as args
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...
#5188 Add special for deleting sequence
#5186 Fix erros in sequence merge and creating new specimen
minor
change preferences page for taxonnode sort
adapting transient service implementation to changes in cdmlib
fixing #5150
Fix NPE
#5143, #5144 Improve load performance for name editor
Move Base operations test class to right package
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
close the polytomouskey-editor if the key is deleted
Disable MediaView for bulk editor (#5162)
Move property tester to editor plugin
#4073 Initial implementation of local cdm-server
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...
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
changes for move descriptions and description elements
Remove comments
Rename Derivative View to Derivative Editor
fix jenkins
fix delete polytomouskeynode and improve merge in bulk editor
#5130 Extend import wizards to import data via remoting and Add tests for the same
#5123, #5124 Make ChecklistEditor remoting session aware and fix performance issue with available distribution pereference page
Fix Polytomous Key duplicate entry issue
Add remoting operation / handlers for key list editor
Merge branch 'LibrAlign' into develop
Remove cdmViewer extension usage
Set Visibility according to CdmStore connection
Fix duplicate entity issue with newly created cdm entities
Use new find method with update
merge-update from trunk
Add unimplemented methods to transient service
Update transient service to be compatible with cdmlib service
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...
#5010 : Initial commit to fix duplicate entry issue when creating new key node
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
Reverted all LibrAlign changes (are now in molecular project)
Update operation calls to use uuids as arguments
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
Update handlers to use uuids inarguments
Update ICdmEntitySessionEnabled to no longer extend ICdmChangeListener
#5067 Integrate remoting sessions in derivate hierachy views, Adapt existing actions
Refactor ICdmViewer framework
Removed unnecessary ExecutionEvent
Fix conversion of ShiftChanges to Shifts
Make editor transient term service compatible with cdmlib term service
Use UUIDs instead of CDM objects in AlignmentEditorInput
This avoids session conflicts because the object will be loaded into the correct session when processing the editor input during initialization of the editor.
Re-load sequence to avoid session conflicts.
#5054 Update test for checking terms update
Adjustments to recent module changes in bioinfweb.commons.
AlignmentEditor.createTestContents() marked as deprecated.
InternalError thrown, if a single read alignment shall be saved that contains new single reads, which have been added in the AlignmentEditor. (Implementation does not make sense before the decision whether #4740, #4745 or #4746 shall be implemented.)
Error message added, if a pherogram URL loaded from CDM cannot be processed correctly.
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
Fixed NPE, if a single read has a pherogram object without URI.
#5056 Adapt editor to service layer 'save' method refactoring in cdmlib