EDIT

fix #5330

Revert "minor"

This reverts commit 64367d007ba404e037ccc2b6794b46c4f1f321bc.

minor

minor

#5335 Add get language using label to service

fix #5179 and adapting the tests because the classification argument is needed now

fix delete of specimen with specimenDescriptions

fix move taxon node in natural order

Cleanup IVocService

#5268 Add convert methods which take uuid as input

fixing getUUIDAndTitleCache for Classification and excluding taxa

Fully remove old vocabulary.byClass methods #3843

Add vocabulary list method by term types #3843

minor

minor

move description fix

move descriptions and elements

Merge branch 'ticket-5066' into develop

Conflicts:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java

Cleanup SecurityTest

Adapt listeners and tests to new pre-insert strategy #5066

#5309, #5310 Switch on write transaction annotation for delete, Add load methof for updating session cache

Fix recursive merge call

Add new merge method for root entitites which returns the newly created MergeResult object

Add new service method for retrieving all associated taxa for a specimen

Extend media gathering for taxon specimens

Add merge method to return updated transient object for lists

#5256 Add test for description reference problem

Updating develop poms back to pre merge state

Updating develop poms to hotfix version to avoid merge conflicts

resolving conficts in project versions after hotfixrelease

#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods

updating poms for 3.11.1 branch with snapshot versions

Revert "#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods" since this commit needs to be in a hotfix release.

This reverts commit 2693f7105470815383cdf485355e7fc5ad81ed68.

#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods

Add a new merge method in the service base class which allows the option to return the transient object

minor

minor

fixing merge conflict

minor

minor

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for branch'release/3.11.0' with non-snapshot versions

updating poms for 3.12.0-SNAPSHOT development

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.11.0-SNAPSHOT development

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.10.0-SNAPSHOT development

Deprecate getCharacterData method in service layer

move specimen.getCharacterData to model

Add taxon to updated objects when taxon is not to be deleted

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.9.0-SNAPSHOT development

Revert "updating poms for 3.9.0-SNAPSHOT development"

This reverts commit 1a052a9893afe93249cf81603f410a4e454c305a.

updating poms for 3.9.0-SNAPSHOT development

fixing move Accepted taxon to synonym

#5234 Add required updated taxon nodes

Allow retrieving objects via ICommonService and UUID (#5160)

bug fixes regarding performacne measuring

more detailed measuring time of accumulation in TransmissionEngineDistribution for performance testing

measuring time of accumulation in TransmissionEngineDistribution for performance testing

adding more test cases for ClassificationService

• testTaxonNodeByNameComparator now with hybrid name
• testlistRankSpecificRootNodes better testing of pager

simplifying test code

Fix tagged title generation for taxa

#5220 Enable transactional write to delete method

#5224 Add new change synonym to acc. taxon method

#5213 Add method to move descriptions using uuids as args

Add annotation service to application config

Update test database schema to allow null for consensus sequence

Update test database schema to allow null for consensus sequence

Add primer / amplification service to remoting

#5019 Set correct updated objects

Correct delete behaviour

#5187 Add move methods with uuids as args

Correct setting of status when moving derivates

Make new move method write on commit

Revert back move method with entities as arguments

#5188 Fix issues with deleting specimens , sequences, single reads

adapting test to modified test data

fixing broken pager mechanism for listRankSpecificRootNodes() and improving test coverage

#5177 out-commented code snipped to enable sql logging for performance debugging

typo in comment

set the test to ignore, because the funcionality is not implemented yet.

revert the local changes

changes for tcs import, fixing taxonnodecomparator, polytomouskey deletion and converting from person to team and team to person

Merge branch 'develop' into abcd

#5112 - hiding fall back areas from the hierachchic distribution representation

Increase reference titlecache in test DBs

Replace load with findByUuid for delete with uuid(s) as argument.

changes for deleting polytomous key nodes

#5160 Add new merge method with id's as arguments

adding saving of synonym and taxon for swapSynonymAndAcceptedTaxon

Fix UniqueKey issue for sequence ciations

#5129 Extend export classes to allow for remote exports

Correct default cache initialisation

#2988 avoiding NPE and allowing empty omitlevels (bug fix)

minor code cleaning