EDIT

Disable expanding of key section (#3461)

Trim code

Change merge to standard call for new taxon node

Add null check to derivate label provider (#5271)

Fix child hierarchy for DnaSamples

• Fixed adding and displaying of sub derived units like e.g. media

#5301 Fix null session issues, Add remoting session for feature tree editor

Change null session to singleton with no owner

Add remoting checks for merge, Move to merge call which returns updated transient object

#5256 Add workaround for description reference issue

Pre-select country as named area type for country selection for
specimens (#2353)

Trim code

Add check for remoting to decide whether to merge or save

Always search for FieldUnits in DerivativeSearchView

#5291 Disable data change event firing in case of remoting

#5247 Fix duplicate entity issue for new entities by using the new merge service method which returns the input transient object

#5247 Use updated entities

#5250 Initial attempt at property paths

Merge branch 'remoting-4.0' into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java

Sort classifications in dropdown of taxon node selection dialog (#5184)

Pre-select current classification for taxon node selection dialog
(#3462)

Trim code

Expand polytomous key section #3461

Trim code

Add geoscopes and taxonomic scope as subsection to polytomous key detail
element

Add selection listener to media detail element to allow showing
supplemental data (#3367)

Generalized UriWithLabelElement to use super class

Add Lsid text field to taxonname details view

• added generic abstract class for URI text fields

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

Fix label consistency #5133

#5259 initialising default ranks

Add null check for session

#5250 Add property paths to speed up search

#5228 Add wait cursor when loading data

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java

Fix initialization problems for preferences and editor input

Add preference for opening a newly created specimen in specimen editor

Open a newly created specimen in specimen editor

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java

#5242, #5223 Improve performance of derivate loading and editing

Use wizard to create new specimen

Trim code

#5223 Replace service methods with similar entity calls

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java

#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

Moved "Original Name" field to subclass (#5133)

Trim code

Fixed potnetial NPE

#5228 Remove unnecessary model init on refresh

Optimize Code #5103

I18n for Specimen Editor

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