EDIT

#5960 Use abbrevTitle for reference parsing

#5931 Fix taxon cache strategy does not reflect protected flag in sec
reference

#5838 Fix taxon cache strategy for taxa with missing name

#5909 revert unwanted commit

#5909 fix failing test

#5909 further improve referenced name parser

#5909 Improve referenced name parser, fix encoding and place published for article

#5909 Improve referenced name parser

Add ined. to NonVrialNameParser #5896

Use syn. sec. instead of sec. for synonym sec references #5902

Fix botanical name parsing species with infrageneric epithet #5881

Implement parser for parsing species with infrageneric epithet #5881

Reflect missing name taxon cache strategies #5838

getTitleWithoutYearAndAuthor as Generic for all Non-NomRefs #5833

revert last commit

minor

Further cleanup and rename new default cache strategy to default cache strategy #5833

Remove all old reference cache strategies completely #5833

Further clean up reference cache strategies #5833

Some further cleaning up for single reference cache strategy #5833

Implement single cache strategy for references #5833

• Implemented new class NewDefaultReferenceCacheStrategy and helper class TitleWithoutYearAndAuthorHelper
• Moved all functionality of old ReferenceCacheStrategies to new class(es)
• Moved all old strategies to package .old...

Remove generics from Reference in cdmlib-model #5830

Add secundum micro reference to cache strategy #5767

Remove bidirectionality for supplemental data #5743

cleanup

Allow parsing of accent acute for coordinates #5716

Fix label for taxon description #5547

Remove nomenclatural status type ined. as it is a duplicate for nom.
provis. (related to Cuba #5443)

Add nom. cons. des. to parser #5662

Add orth. rej. to parsing #5649 and clean up test

Fix deduplication problem with list order #5652

Fix combination author without space parsing #5618

Implement notho rank recognition #3868

Add post-separator to better handle tagged text

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

Add separator after nom status in taxon titleCache #5576

Fix et al. for collectors #5568

Fix CCE in DefinedTermDaoImpl.getPartOf (#5556) and make deproxy more
generic

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

Further fix right quotation mark parsing

Add different apostroph to author name parser

organizing imports

Return correct match strategy #5337

Revert "minor"

This reverts commit 64367d007ba404e037ccc2b6794b46c4f1f321bc.

minor

minor

clean up taxon cache strategy

Simplify getNameTags in Taxon cache strategy (#5229)

Create new tag type for secundum reference (#5229)

#3991 hiding the delegeate boolean properties in TaggedText by making them protected

Deproxy name in taxon cache strategy.

Fix tagged title generation for taxa

Implement taggedTitle for taxon base #5229

minor

adding a convertmergeStrategy because of a different handling of merge and convert

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

adding a ConvertMergeStrategy

Fix preliminary 2 capitel author parsing #5096

Fix long running parser #5072

Use ampersand as default for et al. teams #5093

Fix long running name parser problem #5072

Fix missing protected evaluation for Taxon titleCache #5018

cacheUpdater Caryophyllales

cacheUpdater for caryophyllales

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

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java...

fix team cache strategy, add et al. if hasMoreMembers is set

merging trunk into 3.6 branche

fix for #4869

minor changes, renaming, code formatting, javadoc

change method name

fix RegEx dot bugs in NonViralName RegExs

merge trunk into model change 3.6

adapt nonViralNameParser to model changes

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java...

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

fix parsing of hybrids as fullReferenceName #2576

minor

fix hybrid parsing with existing hybrid relationships #2576

cleanup NonViralNameServer doc

code conventions for NVNParserRegEx

implement cache strategy for "et al." #4791

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

first implementation of team->person->team conversion #4769, #4770

remove onlyReallocate links as this is not yet implemented #4768

Make deduplication of TeamOrPersonBase possible in cdmlib #4768 and solve test problem in CdmGenericDaoImplTest #2096, finding some bugs in between

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

Improved parser for zoological names...

type removed from SpecimenTypeParser

adadpt TimePeriodParser to include lifespan

ICdmCacher, ICdmUuidCacher, CdmCacher, CdmTermCacher : refactored and added load method
Language, NameRelationshipType, Rank : now uses cacher only if termap is null or empty and only when class matches the specific term type
MockCdmCacher: not required anymore...

rename Reference.authorTeam -> authorship #4432

minor

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