EDIT

#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

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

• refactored naming of modifier section #4448

• fixed NPE (#4448)

• moved OriginalLabelData to specimen details section (#4776)

• added id to entity selection dialogs (#4799)

• adding of empty persons to teams via DetailsView is not possible anymore (#4913)

Merge branch 'move-to-luna' 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
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml...

added id to uuidAndTitleCache fixes in TaxEditor #4799

• unified section headers for derivative details view
  • show selected element in part title of DetailsView

add dialog for the natural order preference

fixing NPE for empty float values #4448

fix remaining issues for taxon field prefill #4860

• pre-fill parent taxon name in new taxon wizard (#4860)

• fixed combo drop down list by using only plant kind of unit vocabulary

• added hybrid formula checkbox (#4870)

• filtered combo dropdown for modifiers in details view (#4448)

• fixed potential NPE

#4653 if a text field is empty, getText returns null instead of an empty string

• set focus to taxon name field in new taxon wizard (#4811)
  • unified entity selection fields, all have "Browse" and "Delete" now (#2359)

• implemented and added recommended modifier section to Feature DetailView (#4448)

• implemented and added statistical measures section to Feature DetailView (#4448)

• fixed potential NPE (#4448)

Fix Ticket #4592

• implemented geo scope detail section (#4592)

• added measurement unit section to Feature DetailView (#4448)
  • adapted QuantitativeData DetailsView to only show recommended MeasurementUnits

• added state vocabulary section to Feature DetailView (#4448)
  • implemented measurement unit section

• added collection section for state vocabularies (#4448)

• filtered vocabularies by term type (#4448)

• imlemente vocabulary combo selection element (#4448)

fix NPE bug and termloading bug for Usage Records #4247

• added functionality to choose the taxon name for a taxon in the DetailsView (#4393)

• Added browse button to media section which allows to choose the media from existing ones (#2385)

• reduced size of text field for textual data description elements

• fixed bug for maximum elevation

• added missing elements to Reference Detail View for type of Section (#4556)

• added collecting area section to general section DerivedUnit DetailsView (fixes #4473)

Fix wrong handling of ex basionym author #4475

• original label data uses multi line text field (#4565)
  • initially not expanded

• fixed background of checkbox

• added Identifier details section

• added derivate hierarchy section
  • refactored DerivateContentProvider

• simplified identifier creation

• added checkbox for Descriptions to specimen delete dialog