EDIT

#5228 Remove unnecessary model init on refresh

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

Disable login preferences in case of dev server

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

Replace spring application context loading with programmatic loading

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

change preferences page for taxonnode sort

fixing #5150

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

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

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

Trim code

Check for disposed widget

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

Replace deprecated method

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

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

Handle ampersand correctly in section titles (#5142)

fix for #5114

fix #5153

fix jenkins

fix #2480

some layout changes

#5134, #5136 (and potentially #5135) Fix incorrect clean up of session manager and Check for class in new taxon wizard

#5130 Extend import wizards to import data via remoting and Add tests for the same

#5129 Extend export ui for remoting

#5029 Add dev remote source quick connect

#5123, #5124 Make ChecklistEditor remoting session aware and fix performance issue with available distribution pereference page

#5122 Implement Null Entity Session and integrate it in required preference pages

#5209 Implement auto selection of last successfully connected server / instance

#5029 Add login info to application title bar

#5029 Add functionality for login to remember credentials, reconnect and switch user

#5209 Add version ui elements to advanced view, Make port text field editable for localhost servers

#5029 Implement oneclick login for remoting

Fix compile error in FeaturDistributionDetailElement

Add button to open URLs in external browser (#5062)

Add remoting operation / handlers for key list editor

New operation abstract class for merge

#5098 : Fix issue with authentication when using search bar

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

Change color when error occurs

Disable Termeditor menu if CdmStore is disconnected

Add missing null check

Add @Override

Generalize cdmViewer extension point

Refactored parameters to be based on commands.

add the possibility to configure the deletion of taxon nodes

Add method to sessionOwner objects to fine tune performance using property paths

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java

Update ICdmEntitySessionEnabled to no longer extend ICdmChangeListener

#5067 Integrate remoting sessions in derivate hierachy views, Adapt existing actions

Externalize cdmViewer extension point parsing

Add generic context menu for ICdmViewer framework

Refactor ICdmViewer framework

Removed unnecessary ExecutionEvent

Revert incorrect fix (r24331) for taxon titleCache #5018

#5067 Add remoting session to derivate search view

#5054 Add save to make sure term is refreshed

Display URI parsing errors

Remove comments

#5054 Update Term Editor to be remoting compatible

#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)

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/view/dataimport/transientServices/TransientOccurenceService.java

#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

Fix compile error in FeatureDistributionDetailElement

Map preparation materials to derivation event description

Add check to display statistice only when cache is alive

Make background of icon transparent

#5009 Update plugin to use remoting handlers

Add icon for switching to advanced media view

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java...

#5009 Add operations and corresponding tests for delete / update nodes actions

#5009 : missed in last commit

Show abbreviated title cache for authors and refernce in taxon details
view

Show URI parsing exceptions below URI text field (fixes #5055, #5003, #4587)

Avoid duplication of edited team member (#4997)

Add no marker without a markerType (#4588)

Add ticket number to TODO

Refresh view after media view has been switched

Add MediaViewSwitch to media collection elements

Refactored code to use a static method that creates the IAction object.
This can be added by the GUI element itself.

Add button for advanced media view to media attached to desccriptions

Remove duplicate code for advanced media view (#4862)

Refactored code and added interface and abstract class to avoid
duplicate code.

Remove comments