EDIT

cleanup

setting content-type for iiif manifest controller

ref #6113 improving unit title in occurrences KML

Adding metadata loading error details to iiif manifest

fix dnaMarker creation, add to vocabulary

ref #8754: implement delete method for descriptiveDataSet

cleanup classification controller

ref #1447 implement getNameCache

cleanup

fix #8991 add Feature flowering season

minor on ConcurrentSessionTest.xml

cleanup

ref #6113 more kml web services and a missing name service method

ref #8986 solving atrifact version conflict

ref #8986 maven-enforcer-plugin: fail=true and re-enabling maven version check

ref #8986 maven-enforcer-plugin: fail=true and re-enabling maven version check

ref #8986 maven enforcer plugin: disabling maven version test

ref #8986 managing all conflicting artifact versions

ref #8986 setting up maven-enforcer-plugin for all cdmlib modules

ref #6113, ref #8985 adding replacement OPTIONS service only for the KML controller

ref #6113 tempororily disabling the OptionsController

ref #6113 fxing NPE

excluding org.eclipse.emf dependencies

adding maven-enforcer-plugin commented

using embedded jetty in launcher

ref #6113, ref #4488 de-duplicating field units

revert small changes

revert small changes

ref #8857: createTaxonDto as parameter for taxon creation - continue

ref #8857: createTaxonDto as parameter for taxon creation

Revert "ref #6113 temporarily remove kmlMarshaller"

This reverts commit d591d6d83894d7a93fd2fd4295f3314c69cbc7d6.

ref #6113 exclude old jaxb version dependencies from JavaAPIforKml

cleanup

ref #6113 temporarily remove kmlMarshaller

Revert "ref #6113 temporarily remove kmlMarshaller"

This reverts commit 6a4d8b86f4322567cc0d52f04270a9903dfe026b.

ref #6113 temporarily remove kmlMarshaller

ref #6113 producing more complete kml for DerivedUnits & general controller for HTTP OPTIONS requests

developer doc for LifeCycle management

ref #6113 dependencies for gis and kml functionality

ref #8857 NonUniqueObjectException test for new taxon with shared reference

ref #8964 later homonym for => of (changed in csv files)

cleanup

ref #8857 adapt test for non-unique object exception

cleanup

ref #8857 test for non-unique object exception

cleanup

cleanup RedmineRegistrationMessageServiceTest.xml

cleanup

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts

Merge branch 'release/5.14.0'

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

updating poms for 5.15.0-SNAPSHOT development

updating poms for 5.14.0 branch with snapshot versions

Revert "fix #8932 configuring swagger to support overloaded controller methods"

This reverts commit c916a82aeea2d702daa12cd607f5bd5acc25a57f.

cleanup

cleanup

fix #8942: fix NPE for not existing language

ref #8934 adapt Feature and Taxon for FoG status import

cleanup

ref #8725: add preferencePredicate for showIdInVoc in textfield

fix #8932 configuring swagger to support overloaded controller methods

ref ref #8815 adding condition which was lost during conflict resolution

ref #8815 reverting return types from UuidAndTitleCache to TaxonNodeDto

Revert "ref #8815: add UuidAndTitleCache methods again in taxonnodeservice"

This reverts commit 47c1bab5d954d21e17653072c211a7ae53e53e97 + 75e3aef5f2a567e2833c03f13194b062a5d58947

Resolved Conflicts:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java...

ref #6113 adding dependency to KML types

cleanup

ref #8886 add Fungi to NonViralNameParserImpl

remove redundant factory code in User

fix #8428 avoiding NPE

ref #8905: fix description handling in specimen imports

ref #8907 adapting method to SortableTaxonNodeQueryResult - adding test

ref #8907 adapting method to SortableTaxonNodeQueryResult and fixing NPE

fix #8899 fixing 4 NPEs in ManifestController

ref #8907 adding missing constructor to hql query

cleanup

cleanup

cleanup and remove ITitleDao.findByTitleAndClass(xxx) (2)

cleanup and remove ITitleDao.findByTitleAndClass(xxx)

fix #8911 fixing initstrategy for Taxon Descriptions

cleanup

cleanup

fix correct handling of description configuration

moving ReferenceEllypsisFormatter to package eu.etaxonomy.cdm.format.reference

ref #8907 basing testGetTaxonNodeUuidAndTitleCacheOfacceptedTaxaByClassificationForNameWithoutRank on TaxonNodeDaoHibernateImplTest.findWithoutRank.xml

ref #8907 cleaning up test data

ref #8907 SortableTaxonNodeQueryResultComparator to replace UuidAndTitleCacheTaxonComparator - step 2

ref #8907 SortableTaxonNodeQueryResultComparator to replace UuidAndTitleCacheTaxonComparator

cleanup

cleanup

cleanup

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts

Merge branch 'release/5.13.0'

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

updating poms for 5.14.0-SNAPSHOT development

fix #8892 fix select statement for TaxonNodeDaoHibernateImpl.getUuidAndTitleCache()

ref #8892 implementing test for TaxonNodeDaoHibernateImpl.getUuidAndTitleCache()