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

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

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

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)

Change order parameters in DetailsView for sources (#5133)

Handle ampersand correctly in section titles (#5142)

fix for #5114

fix #5153

fix jenkins

fix #2480

some layout changes

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

#5029 Add dev remote source quick connect

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

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

add the possibility to configure the deletion of taxon nodes

Merge branch 'develop' into remoting-4.0

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

Revert incorrect fix (r24331) for taxon titleCache #5018

Display URI parsing errors

Remove comments

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

Fix compile error in FeatureDistributionDetailElement

Map preparation materials to derivation event description

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

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

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

Empty text fields return empty string and not null

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

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

Rename NonViralName authorteams to authorship #4968

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/name/operation/DeleteTaxonOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java...

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

• 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

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

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

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/.gitignore
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java...

minor

• fixed order of team members #4936

• fixed NPE (#4937)

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

Conflicts:
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...

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

minor

add checkbox for additional team members

#4725

fixing the disabling of the ToggleableTextElement when the titlecache is protected.

clean up

• added preferences for vocabulary names in term labels #4448

• 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

moving UuidAndTitleCache from model to persistence (changes in Editor). #4799

• initially expand modifier section if modifiers exist #4448

• moved OriginalLabel above sources #4776

• fixed copy&paste error #4799