EDIT

minor

fixing #5341 and colouring for cache relevant fields #4915 and #4944

Remove identifier and taxon associations from bulk editor details view

• reduce space taken by taxon associaton section #5348

Show taxon associations only when they exist

Handle image loading

- add label to indicate that image was not found
- refactored code

Add image preview to media simple view

#5357 Add check to avoid transient object exception

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

fix #5261 and minor

Fix setting of key statement

add distinction between remote and standalone for getting the geoService

last changes for #5114

minor

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

#5114 fix

Use convenience method for associated taxa

create new taxonnode with reuse name or taxon now with more consistence enabled/disabled buttons

minor

minor in TaxonNodeDetailElement

merge branches

minor

merge

minor

improve messaging for deleteResult

minor

#5256 Add workaround for description reference issue

fixing problem of reusing name for creation of taxon

#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

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

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

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

Merge branch 'develop' into remoting-4.0

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

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

Trim code

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

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

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

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

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

Trim code

Merge branch 'develop' into remoting-4.0

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

Replace deprecated method

fix #5153

Merge develop into branch

Create constant for default column number in detail sections

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

Change order parameters in DetailsView for sources (#5133)

Handle ampersand correctly in section titles (#5142)

fix for #5114

fix #5153

fix jenkins

fix #2480

Fix compile error in FeaturDistributionDetailElement

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

Revert incorrect fix (r24331) for taxon titleCache #5018

Display URI parsing errors

Remove comments

Fix compile error in FeatureDistributionDetailElement

Map preparation materials to derivation event description

Add icon for switching to advanced media view

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

Remove comments

Rename NonViralName authorteams to authorship #4968

Fix problem with non persisted taxon titleCache change: #5018

• update parent scroll form on property change (fixes #4881)

• removed initial expand of sections

• fixed potential NPE

• changed type of "Materials & Methods" to text instead of DefinedTerm
  • fixed label

• split off "Preparation/Preservation section" from dna sample general section

• fixed order of team members #4936

• fixed NPE (#4937)

• added wizard page listener to react on ENTER key #4853

minor

add checkbox for additional team members

#4725

clean up

• combo dropdowns intitially show an empty field which is now removed when selecting any other entry
  • added vocabulary information to term label #4448

• removed empty element from combo dropdown #4448

• initially expand modifier section if modifiers exist #4448