EDIT

Return correct match strategy #5337

#5297 Refactor ProgressMonitorController, Add Remoting Progress monitor

#5297 Add progress monitor service, Add test services

#5297 Add monit import method

#5297 Update no. of work units

#5297 Add new thread class for remoting monitors

#5297 Add owner field to monitor thread and user checks in service...

Minor cleanup

Fix test in dataportal with strict bean initalization #5077

Revert "minor"

This reverts commit 64367d007ba404e037ccc2b6794b46c4f1f321bc.

minor

Add some more BeanUtil test to other classes #5307

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

fix #5179 and adapting the tests because the classification argument is needed now

accept the change from a number to null in TimePeriod fields #5319

Merge branch 'ticket-5066' into develop

Conflicts:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java

minor clean ups

Add cascade merge to members field

#5281 Make SingleReadAlignment.Shift serializable

#5299 Add new entity listener and event firing

Updating develop poms back to pre merge state

Updating develop poms to hotfix version to avoid merge conflicts

minor

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.12.0-SNAPSHOT development

#5259 Add method to init defaul terms

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.11.0-SNAPSHOT development

#5249 Correct if statements

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.10.0-SNAPSHOT development

#5223 Copy utility method from service to derived unit

Implement hasCharacterData and isCharacterData.
And fix characterData semantics.

move specimen.getCharacterData to model

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.9.0-SNAPSHOT development

minor

Revert "updating poms for 3.9.0-SNAPSHOT development"

This reverts commit 1a052a9893afe93249cf81603f410a4e454c305a.

updating poms for 3.9.0-SNAPSHOT development

clean up taxon cache strategy

Document new initListener method (#5161)

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

Set sequence to null when removing a single read #5200

#5138, #5102 Fix cascade delete orphan error for address list in contact entity

removing System.out.println

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

#5161 Add initListener method to CdmBase object

add @Audited to startNumber

changes for deleting polytomous key nodes

Revert final qualifier after discussion in #5102

adding IdInVocabulary to the toString representation of NamedAreas

#5100 Fix default language for remoting

Intialise addresses in declaration to avoid orphan cascade issue

#5067 Updates for remoting derivate hierachy views

Fix preliminary 2 capitel author parsing #5096

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

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

Updating develop poms back to pre merge state

Merge branch 'release/3.7.0'

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

Revert back to earlier version

Fix taxon node comparator handling #4226

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

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

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

updating poms for 3.8.0-SNAPSHOT development

Remove unnecessary version property in sub-modules

Revert back to version 3.7.0-SNAPSHOT

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.8.0-SNAPSHOT development

Revert versions back to current

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.14-SNAPSHOT development

updating poms for 3.13-SNAPSHOT development

updating poms for 3.12-SNAPSHOT development

updating poms for 3.11-SNAPSHOT development

updating poms for 3.10-SNAPSHOT development

updating poms for 3.9-SNAPSHOT development

updating poms for 3.8-SNAPSHOT development

Update all version to next snapshot and remove duplicate version settings

Fix long running name parser problem #5072

Avoid NPE in ShiftUserType

Fix missing protected evaluation for Taxon titleCache #5018

cacheUpdater Caryophyllales

cacheUpdater for caryophyllales