EDIT

#5234 Add correct updated objects to change event

#5233 Correct login / password persistence

Disable persisting login preferences when connecting to dev server

Add initModel call to constructor since it requires the type to be set beforehand

#5225 Replace saveOrUpdate with merge for new entity wizards

#5228 Remove unnecessary model init on refresh

Cleanup unused code

#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

#5214 Fix initialization of remoting session

Replace saveOrUpdate with merge

Ignore test server ping tests

Ignore edit test server ping test

Ignore unauthenticated user test for now

#5052 Integrate remoting in granted authorites editor

Disable login preferences in case of dev server

Add test for unathenticated user

Enhance handling of simple and advanced media view

• Buffer URI string in case of parsing errors
• disable toggling when media conists of more than one representation or part

Close conversation when closing DerivateSearchView

Fix NPE for advanced media view

Enable test for taxon nodes deletion

Check if updated objects are null

Set read timeout for services to infinite

Replace spring application context loading with programmatic loading

Correct test to use uuids

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

Add unimplemented methods

Correct merge

Merge branch 'develop' into remoting-4.0

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

moving taxonnode with drag & drop as predecessor fixed

#5138 Add test for normal Person load case

change preferences page for taxonnode sort

adapting transient service implementation to changes in cdmlib

• deprecated method removed

fixing #5150

error handling in deleteHandler/operation of navigator

better messaging when convert person to team does not work

Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch

moving more than one taxon node, merge of team and person, reusing name for new taxon

Add space to message

#5181 Fix incorrect load of CdmServiceCacher when connecting via Datasource view

Ignoring test until #5138 is fixed

Merge remote-tracking branch 'origin' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml...

#5138 Add test for cascade error

Fix NPE

Avoid exception loop when taxon name is null (#4996)

Do not show taxon navigator menu entries when nothing is selected

Trim code

#5009 Fix post polytomous key delete operation event handling

#5161 Initialize listeners on cdm entities before put in cache

#5161 Fix problem of new entity not refreshed

Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch

fix #5171

Check for disposed widget

#5143, #5144 Improve load performance for name editor

Move Base operations test class to right package

Add PDE runtime environment to target platform (provides Plug-In Spy)

Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch

close the polytomouskey-editor if the key is deleted

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

Disable MediaView for bulk editor (#5162)

• bulk editor does only activate media view when showing taxa
• code trimming

Move property tester to editor plugin

Replace deprecated method

Merge branch 'develop' into LibrAlign

#5160 Use new merge method with ids as arguments

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

#5160 Use new merge method with ids as arguments

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

fix #5153

fix #5153

Externalize Strings

Merge develop into branch

Change order of controls

Use web icon for URL button

Create constant for default column number in detail sections

Split up control creation of TextWithLabelElement

• this fixes layout problems when inserting a separate button for opening links

Trim code

Remove equal width from columns

Test implementation of Copy action added to AlignmentEditor.

Correct properties file load and server info test

Add entity type to CdmChangeEvent and fixes #5139

Externalize strings

#4073 Initial implementation of local cdm-server

Merge branch 'develop' into remoting-4.0

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...

Warn user that URL will not be saved in bold and red (#5065, #5141)

Add OS and java info to MessagingUtils stacktrace

Change order parameters in DetailsView for sources (#5133)

Support UUID search in bulk editors (#5103)

Trim code

Remove comments

Handle ampersand correctly in section titles (#5142)

Fix application ID