EDIT

Removed OccurrenceView

Fix session problems with remoting

Merge branch 'develop' into unify_derivative_views

Listen to selection changes in DerivateEditor

#3771

Add conversation/session support to OccurenceView

Disable term menu when disconnected (#4901)

Merge branch 'develop' into unify_derivative_views

#5301 Add merge call for saving new feature tree

#5335 Use new getLanguageByLabel methof in term service

#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

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

fixing #5324 and #5325

Bind null session for new derived unit wizard

#5321 Add missing return statement for bad credentials

Adapt TaxEditor to use vocabulary term type instead of class: #3843.

add distinction between remote and standalone for getting the geoService

Revert "Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT"

This reverts commit 9524fa3910c8335a6cbcb656f9aacaca01a3f5ca.

Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT

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

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

#5114 fix

Merge branch 'develop' into unify_derivative_views

Fix label

Listen to taxon selection

Fix potential class cast exception

Fix potential NPE

Use convenience method for associated taxa

Fix typo

new ErrorDialog for delete result messaging

improve messaging for deleteresults

Add initial OccurenceView to RCP plugin

minor

check for isdeletable before set delete button disabled

Move derivative search view classes to taxeditor.editor

• adapted DerivateView

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

minor in TaxonNodeDetailElement

merge branches

minor

Disable expanding of key section (#3461)

Trim code

merge

minor

in a selection element an disabled element can't be deleted so the delete button should be disabled too

Disable expanding of key section (#3461)

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

improve messaging for deleteResult

Trim code

Change merge to standard call for new taxon node

Add null check to derivate label provider (#5271)

Disable menu items when not connected to CDM store (#4901)

minor

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

minor

fixing problem of reusing name for creation of taxon

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

Fix versions

Fix versions

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

Revert project versions to 3.11.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 3.12.0-SNAPSHOT and cdmlib version : 3.12.0-SNAPSHOT

Fix label consistency #5133

#5259 initialising default ranks

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

Add null check for session

#5250 Add property paths to speed up search

updating poms for 3.11.0-SNAPSHOT development

#5228 Add wait cursor when loading data