EDIT

add cdmPreference showLifeForm

#2342 ref #6755 try to fix LIE in remote

ref #2342 ref 6755 fix some issues in higherClassification handling in DwC-A export

ref #2342 first implementation of higherClassification handling in DwC-A export

cleanup

revert unwanted commit a509a0ab9082876741

ref #6730 try to remove compilation problem in MediaServiceImpl.delete

ref #6730 remove some further redundant code in MediaServiceImpl.delete

cleanup

ref #6960

ref #6957 first version of viral name cache strategy

fix #6842 fix bugs in Registration.setName

revert MediaUtils

set Mobot test to ignore preliminary

adapt cdmLightExport for using TaxonNodeFilter

revert changes to MediaUtils

remove deprecated in NomenclaturalCode constructor

cleanup

ref #6887 handle modified in CoL import

cleanup

avoid NPE in deleteChildNode

ref #6887 handle languages in DwCA CoL import

ref #6887 add description.txt to CoL import

• add DISTRIBUTION_GENERAL to Feature static methods
• import fields with default values

cleanup

cleanup

ref #6684 handle casting and null for preferred media part

cleanup

cleanup

cleanup

fix #6856 adding group Admin to FirstDataInserter

fix #6630 remove rectifyNameCacheStrategy to differ name types

ref #6630 unify ViralNameDefaultCacheStrategy with NonViralNameDefaultCacheStrategy

fix #6842 avoiding NPE in Registation - better aproach

fix #6842 avoiding NPE in Registation

ref #6694 Fix javadoc

ref #6694 Remove cascading to FeatureNodes from Character

minor

move taxonNodeFiler to model

ref #6754 further adapt DwC-A export

cleanup

cleanup

minor

reorganize publication date output in cdm light export

typo

minor

ref #6661 remove brackets from initials updater

fix NPE in WebPage cache strategy

ref #6368 remove commented all TaxonName subclasses completely

fix #6656 autonym hybrid parsing with parseReference

ref #6535 fix calls to version number from other places

ref #6661 some final updates for addInitials to person (length = 80 + handle ' in updatescript)

fix #5817 rename RelationshipTermBase_inverseRepresentation

fix #6472 add key as target for IntextReference

ref #3665 adapt orginal spelling name cache strategy to user wishes, also ref #6630

fix #5258 add accessed to WebPage cache strategy

ref #6368 remove some further occurrences of ITaxonNameBase

ref #6369 cleanup botanical name interface

ref #6445 add isFungus to NomenclaturalCode

minor

ref #6368 , ref #6671, ref #6630 adapt eflora to no taxon name model

ref #6630 and ref #6368 remove generics from TaxonName

ref #6630 unified all taxon name cache strategies except for ViralNameDefaultCacheStrategy

ref #6368 some adaptations after rebase

fix #6368 rename table and class TaxonNameBase

ref #6368 remove some further occurrences of NonViralName

ref #6368 remove TaxonNameBase subclasses

Merge branch 'develop' into feature/cdm-4.7

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java

minor

rename term to description in Feature again

Revert "rename term to description in Feature"

This reverts commit ce781a48f8801c3f2168cae24d3a67363a556a12 except for the wanted change

rename term to description in Feature

fix #6663 add attributes for externally managed references

fix #6662 adapt person formatting, put initials to end

cleanup

fix #6661 add initials to Person

Merge branch 'develop' into feature/cdm-4.7

make status present uuid public

ref #6535 add quotation marks for hardcoded SQL propertyname parameter

fix #6656 make autonym hybrids parsable

cleanup

minor

cleanup

ref #3665 use high quotation marks and round not square brackets

fix #6535 change CdmMetaData.propertyName from int to string

cleanup

ref #6258 Added basic bidirectionality for Registration.name and typeDesignation

ref #6612 implemented list (ref ...) for RegistrationDaoHibernateImpl

fix #6367 make nomenclaturalCode an attribute of TaxonNameBase

ref #6258 add RegistrationStatus to EnumUserType

Merge branch 'develop' into feature/cdm-4.7

Conflicts:
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/distribution/excelupdate/ExcelDistributionUpdate.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/MnTableCreator.java

ref #6618 add class Character and attributes structure and property

#6617 Add Exact Value to StatisticalMeasure

cleanup

ref #6258 satisfying @NonNull annotations for collection properties

Merge remote-tracking branch 'origin/cdm-4.7' into feature/cdm-4.7

#6612 dao and service classes for the Registration class

• service implementation incomplete

Avoid dependency to org.codehaus.plexus.util.StringUtils

cleanup

ref #6529 add Jaxb annotations for WorkingSet changes

ref #6258 add Audited to Registration