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

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

minor

#5259 Add method to init defaul terms

#5249 Correct if statements

#5223 Copy utility method from service to derived unit

Implement hasCharacterData and isCharacterData.
And fix characterData semantics.

move specimen.getCharacterData to model

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

Use ampersand as default for et al. teams #5093

Fix taxon node comparator handling #4226

Fix long running name parser problem #5072

Avoid NPE in ShiftUserType

Fix missing protected evaluation for Taxon titleCache #5018

cacheUpdater Caryophyllales

cacheUpdater for caryophyllales

Fix singleton constructor with specimen types

Do not set consensus sequence of single read alignment to null when
deleting the alignment

Add getTermByIdInVoc method to vocabularies

Fix unparsed sections and subsections #4764

Fix possible but in FeatureNode sortindex creation

See similar issue in TaxonNode sortindex creation.

minor

minor

Fix sortindex computation in TaxonNode

After commit from 2015-06-18 the sortindex was computed slightly
different. In some cases the parent was not deproxied anymore and
therefore the parent.childNodes always returned the empty list of the
proxy object instead of returning the actual childrens list.

Improve E+M post import methods #3979

Add publisher role uuid and clean up FirstDataInserter #3979

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

forgot to check in the changes

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

add @Audited to the argument type

fix #4976 Titlecache for new vocabularies not filled correctly

minor cleanup

correcting wrong merge

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

jaxb annotation fixed for agentRelations #3583

rename authorTeam -> authorship #4332 for name authors

merge trunk into 3.6 branch

last changes for #4869

changes for #3998

fix setStatisticalValue method

minor

fix test and add factory method #3583

some cleanup, renaming and a test for TaxonNodeAgentRelation #3583

more getters/adders, update script, vocabulary and test vocabulary for TaxonNodeAgentRelation #3583

first implementation of TaxonNodeAgentRelation #3583

minor

minor cleanup

merging trunk into 3.6 branche

fix for #4869

minor changes, renaming, code formatting, javadoc

minor

improve handling of titlecache in terms #3148

improve handling of titlecache in terms #3148

moving UuidAndTitleCache from model to persistence. #4799

change method name

Simplify table structure for CategoricalData-StateData and and QuantitativeData_StatisticalMeasurementValue #4841

fix RegEx dot bugs in NonViralName RegExs