EDIT

ref #6806 Make setTaxonSubtreeFilter public

Merge branch 'develop' into wset

Do not add null to feature set

ref #2335 make WorkingSet identifiable + services

removing offending import of javafx

ref #6887 add description.txt to CoL import

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

cleanup

cleanup

ref #6694 Fix javadoc

ref #6694 Remove cascading to FeatureNodes from Character

minor

cleanup

minor

fix #5817 rename RelationshipTermBase_inverseRepresentation

fix #6472 add key as target for IntextReference

minor

ref #6630 and ref #6368 remove generics from TaxonName

fix #6368 rename table and class TaxonNameBase

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

rename term to description in Feature again

rename term to description in Feature

Merge branch 'develop' into feature/cdm-4.7

make status present uuid public

ref #6618 add class Character and attributes structure and property

#6617 Add Exact Value to StatisticalMeasure

cleanup

ref #6529 add Jaxb annotations for WorkingSet changes

cleanup

ref #6529 first implementation of WorkingSet taxon filter

cleanup

minor

#6286 add Lifeform to default features

ref #6410 latest changes for eFlora (FM 15) import

new factory methods for sources

Cleanup

cleanup

cleanup

ref #6190 removing svn property place holder in first line of code

ref #6283: minor changes to fix exceptions in polytomous key editing

ref #6283: fix NPE exceptions caused by null values in children list

solving polytomouskey node sort index problems

Latest BM import updates for Salvador

Remove deprecated adder methods for multilanguage text

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestModelUpdate.java

fix #5680: get method needs to be named like the attribute

Cleanup language string handling and cloning

specimen import changes

#6000 Add static methods and uuids for new PAT terms

#6000 Use new CASUAL Method instead of derpeacted INTRODUCED_ADVENTITIOUS

#6000 Unify some PresenceAbsenceTerms (merge naturalized, rename adventitious -> casual, etc)

#5777 Fix symbol reading for PresenceAbsenceTerm csv

specimen import changes

#6000 Add static methods and uuids for new PAT terms

#6000 Use new CASUAL Method instead of derpeacted INTRODUCED_ADVENTITIOUS

#6000 Unify some PresenceAbsenceTerms (merge naturalized, rename adventitious -> casual, etc)

#5777 Fix symbol reading for PresenceAbsenceTerm csv

#5875 Add isDefault flag to DescriptionBase

remove updateSortindex and move removeNullValues to the mergeListener

#5678: fix deletion of FeatureNodes and minor changes

#4366 Transmissionengine aggregation of source references

#5916 Add (taxonomic) 'Notes' as new Feature to Feature vocabulary

#5536

Remove generics from Reference in cdmlib-model #5830

Add jaxb annotation for reverse representation #5815

Remove indexing from reverse feature representation #5815

Define column name for feature inverse representation #5815

Move factory methods up (Feature)

Move static constants to top (Feature)

Add inverse representation to feature #5815

Update symbols for PresenceAbsenceTerms in csv files #5777

Cleanup MediaRepresentationPart and PolytomousKeyNode #5756

Remove cascading to terms #5755

minor

Add getter/setter/termloader for (inverse)symbol, fix update script
#5734

Remove bidirectionality for supplemental data #5743

Add SaveOrUpdate to PKNode.otherNode

Clean up DescriptionElementSource.java

Adapt table and column names to hibernate 5 naming strategy #5369

... and some other changes to table/attribute names

#5679 catching and ignoring LIEs during the attempt to clean up NULL items in sets

fix move taxonnode and remove null values from childrenlists in several places

Add cultivated, presence questionable to PresenceAbsenceTerms #5443

workaround for delete of polytomous keynodes, because of null values in children list

Add reported in error static method

Fix bug in TextData factory method.

Use correct column length annotation #5535

organizing imports

#4716 reduicing clutter in the lucene index and solving performance problems which probably fixes #4277 and #3663

index creation without errors, most lucene search test working again

• using TextField instead of StringField to enable tokenization for some fields
• @IndexedEmbedded(includeEmbeddedObjectId=true) added where necessary

Update some more hibernate mapping nameings #4716 and #5369

Upgrade to hibernate 5 with persistence tests running #4716

fixing #5303

fixing #5303

fix #5341 and fixing deletion of specimen

Minor cleanup

Fix test in dataportal with strict bean initalization #5077

Implement hasCharacterData and isCharacterData.
And fix characterData semantics.

add @Audited to startNumber

changes for deleting polytomous key nodes

Update service layer calls to use uuids, Add property paths to find call for performance tuning