Trim code
#5366 Add preference for disabling services api timestamp check
#5297 Add remoting progress monitoring
#5297 Change active seesion variable to a inheritable thread local variable and add relevant tests
Add monitered operation
#5297 Add post monitor operation callback, Add report text dialog
#5297 Add progress monitor client manager...
#5357 Add check to avoid transient object exception
#5350 : Use newly added getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification method with uuid
#5306 Use default language if preferred language is null
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
fix #5261 and minor
Fix setting of key statement
fixing #5324 and #5325
Adapt TaxEditor to use vocabulary term type instead of class: #3843.
add distinction between remote and standalone for getting the geoService
Add test for editor / server cdmlib version check
#5302 Add cdm version and services version check
#5309, #5310 Add load method to retrieve user entity after create and password change
last changes for #5114
minor
#5114 fix
Use convenience method for associated taxa
check for isdeletable before set delete button disabled
I18n of login and data source view
Fix potential NPE
Fix named area filter for selection dialog (#2353)
create new taxonnode with reuse name or taxon now with more consistence enabled/disabled buttons
minor in TaxonNodeDetailElement
merge branches
merge
in a selection element an disabled element can't be deleted so the delete button should be disabled too
improve messaging for deleteResult
#5256 Add workaround for description reference issue
fixing problem of reusing name for creation of taxon
Pre-select country as named area type for country selection for specimens (#2353)
#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
Sort classifications in dropdown of taxon node selection dialog (#5184)
Pre-select current classification for taxon node selection dialog (#3462)
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
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
#5228 Add wait cursor when loading data
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
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
#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)
#5228 Remove unnecessary model init on refresh
I18n for Specimen Editor
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
Fix NPE for advanced media view
Replace spring application context loading with programmatic loading
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)
Check for disposed widget
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
Remove equal width from columns
Add entity type to CdmChangeEvent and fixes #5139
Externalize strings
#4073 Initial implementation of local cdm-server
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 jenkins