EDIT

Improve sort order within a homotypic group (new Comparator) #3338

Fix combination author without space parsing #5618

Implement notho rank recognition #3868

Add new test for author name parsing

Fix cache strategy for taxon base with appended name #5586 and #5577

Add separator after nom status in taxon titleCache #5576

Merge branch 'hotfix/3.12.3' into develop

Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java

Fix volume range bug in name parser #5518

organizing imports

Upgrade to hibernate 5 with persistence tests running #4716

Upgrade to spring 4.2.2, spring-security 4.0.2 and latest hibernate
validator #4716 and #4702

Add some more BeanUtil test to other classes #5307

Fix bean read/write inconsistency in Taxon and TaxonBase #5307

#5299 Add new entity listener and event firing

minor

Implement taggedTitle for taxon base #5229

Fix preliminary 2 capitel author parsing #5096

Fix long running parser #5072

Preliminary fix long runnig parser test

Add commented test for long running parsing #5072

Use ampersand as default for et al. teams #5093

index on master: 945061f Fix long running name parser problem #5072

Fix long running name parser problem #5072

Fix missing protected evaluation for Taxon titleCache #5018

Fix umlaut bug in parser test

Fix unparsed sections and subsections #4764

Rename remaining occurrences of xxxAuthorTeam #4968

Rename remaining occurrences of combinationAuthorTeam and
basionymAuthorTeam in code and other files

Rename NonViralName.xxxAuthorTeam to xxxAuthorship #4968

fix titleCache for et al. teams #4967

fix parsing of names with teams in name and reference #2223

• add @Audited to all type properties
• add taxonNodeComparator for rank and alphabetical orderedVocabularyDao
• change delete() methods arguments to UUIDs

minor cleanup

merge trunk into model change 3.6

updated NonViralNameParserImplTest

make the taxonomic tree editable in natural order (see #3771), adding comparator

fix hybrid parsing with existing hybrid relationships on full reference parsing #2576

fix parsing of hybrids as fullReferenceName #2576

fix hybrid parsing with existing hybrid relationships #2576

implement cache strategy for "et al." #4791

quick fix for cache strategy exception. Cache strategy not yet correctly created. #4773

add O'Connor and zur Strassen as parsable authors. #4759

remove imports

add test for disassamble

remove failing sqlType test

handle empty Shift #4734

Improved parser for zoological names...

merge validation2 and model 3.5 into trunk

for infrageneric unranked rank adding unranked
fixing bug with deletion of names and homotypicalGroups

activating the swagger rest service documentation by reverting the revertion of the premature committed experimental branch (swagger) svn: r21387, git: be528c1edf

test for Amplification labelCache

add first version of BigDecimal (still unclear if we want to keep the UserType) #4499

merge PresenceTerm and AbsenceTerm #4521

• added exception throwing to URI assembly in Sequence class
  • handled exception in editor details view

add WebPageDefaultCacheStrategyTest

Make Contact URL an url #3920

rename Reference.authorTeam -> authorship #4432

adapt tests to missing Reference.series #4293 and not null constraint for test database ddl #4382

rename Reference.authorTeam -> authorship #4432

fix delete taxon nodes with children

typos

add vol to generic infereference formatting

better handling of abbreviated title cache in references, series -> seriesPart and some improvements in the reference cache strategies #4280, #4239 , changes in tests

Change authorTeam types in NonViralName from INomenclaturalAuthor to TeamOrPersonBase #1489

removing old ignore and FIXME #530

reverting erroneously committed experimental branch (swagger)

implementing CdmTypeScanner and test

remove double dots before year in nomrefs

Remove ". " from year only nom-refs

move MockCdmCacher to TermLoader

remove (bot.) for name creation in botanical names of rank section #4122 and #4279

fix failing single model test due to new MockCdmCacher

added comment for mock cdm cacher

MockCdmCacher : added mock cdm cacher for tests in cdmlib-model
IdentifiableEntityTest : using mock cdm cacher in tests

minor

Add preliminary SectionCacheStrategy and remove generics from reference cache strategies

#4114 sort order in taxon navigator and adding that autonyms could be whether infraspecific or infrageneric (Art. 22.3 and 26.3)

fix compareTo for IdentifiableEntity

minor

add NomStatus vocabulary for ICZN #4085

minor

minor

making TaxonNodeByNameComparator truely null save - #2912 (NPE in TaxonNodeByNameComparator when Taxon in TaxoNode is null)

Cleaning up a bit

solving some reference cache strategy issues, e.g. #3645

improve author parsing

minor

try to fix test failing on midnight

test taxon title cache generation #3833

test taxon title cache generation #3833

minor

reordering and changing tests for OriginalSOurceType and make second non capital in MeasurementUnit.csv

change version ->3.3.0, move CdmMetaData, change schema version -> 20130924, fix TaxonServiceSearch test, update update-script

moving preferences into new package and some minor changes

partial implementation of CDM preferences (dao, service and enums): #3555

Change WaterbodyOrCountry name to Country #3700

implement DOI class and use in Reference #3572

rename getRankByAbbrev methods to getRankByIdInVoc #3479

minor changes, remove private methods

add kindOfUnit vocabularies to CDM and tests (update script still missing) #3568

minor