EDIT

whitespace

removing non java doc method comment

Remove unused occurrence service method (2)

Remove unused occurrence service method

ref #7095 Fix NPE in specimen selection dialog

ref #7095 Add property paths to some methods

ref #7095 Add progress monitor to working set service (unstable)

ref #7095 Move specimen and description loading to service layer

ref #7348 moving RegistrationDTO related classes from cdm-vaadin to cdmlib-services

ref #7086 Add getter for structure and property

minor

fix failing clone tests

ref #7095 Fix convenience method for CategoricalData

ref #7336, ref #7334 add pro parte synonym, partial synonym and partial misapplied name as taxon relationship types

fix clone method for TaxonBase

ref #5762 adapt clone method in IdentifiableEntity as rights are reusable now

cleanup

also revert the test changes

revert null check in merge

minor

avoid potential NPE

smaller changes and code cleaning

moving AlternativeUnitilsJUnit4TestClassRunner to org.unitils

moving AlternativeUnitilsJUnit4TestClassRunner to org.unitils

ref #7331 test created and loging more details at level TRACE

cleanup

ref #7328 make distanceString method static and public

ref #6484 Adjust count method to find method to return the same number

• performance can still be improved by integrating AssignmentStatus and/or indirectlyAssociatedSpecimen into the HQL query

ref #6484 Move enum AssignmentStatus to cdm-persistence

ref #7325 applying taxeditor changeset (98baf5f ref #6389) onto cdmlib-cache

fix #7209 removing scm entries from maven submodules

ref #7324 Add new service method getFieldUnitsForGatheringEvent()

fix #7323 adding missing uuid match check in furtherVotingDescissions()

ref #7269 workaround for redmine bug https://www.redmine.org/issues/28383

ref #7269 fixing bug regarding Curator field and extending test

ref #7269 ExternalServiceException more detailed information

ref #7269 setting curator when posting messages (not yet working)

avoid NPE in TaxonNodeDtoComparator

add some more CdmPermissionClasses

add some more CdmPermissionClasses

error handling for term compare with missing vocabularies

minor

ref #4347 Allow DOIs for IArticle

cleanup

fix #7308 Add nomen oblitum to zoological taxon name status

ref #6158 avoid URL redirects

ref #2380: improve implementation of Dto for use in taxonnavigator

cleanup CdmPermissionClass

doc

minor

revert test changes

revert changes in listChildNodesAsUuidAndTitleCache

revert accidently commited changes

minor

simple taxon list import

adapted deleteResult

DeleteResult should contain a list of deleted objects, update delete methods

cleanup

fix UTF8 issue in NonViralNameParserImplTest

override includeResult in deleteResult

ref #7285 add uuids for cohort and hyporder

ref #7304 reduce author part in booksections to 2 words in name parser

cleanup

Fix NPE in occurrence test

minor

fix 7292: fix Exception when searching for all taxa

ref #6668 Include deleted derivatives recursively into DeleteResult

cleanup

ref #7280 moving redmine integration server to edit-int

ref #7269 improving performance by factor 1.3

ref #7269 redmine issues made private and public methods in interface

ref #7269 making redmine issues private

ref #7269 pulling public service methods into service interface

extending CdmPermissionClass

extending CdmPermissionClass

extending CdmPermissionClass

ref #7269 fixing test environment to allow running RedmineRegistrationMessageServiceTest in the surefire test suite:

• fixing cdmlib-ext test application context
• avoiding CdmRepository as autowired spring bean

lowering loglevel in test

ref #7287 reverting DerivedUnitFacade test back to using tests

ref #7287 fixing bug

ref #7289 suppressing HHH90000003

ref #7287 base test class for all unit tests which need terms being initialized

silencing chatty test

silencing chatty test

silencing chatty test

ref #7269 comment

fix #7269 implementing RedmineRegistrationMessageService

typo

fixing test application context for cdmlib-ext

creating parent directories if missing

moving AlternativeUnitilsJUnit4TestClassRunner from cdm-vaadin to cdmlib-test

fix #7277 add µm to MeasurementUnit

cleanup

fix #6547: implement unplaced/excluded comparison also for TaxonNodeByNameComparator

cleanup

fix #7249: deleteTypeDesignation for uuids needs to be transactional

fix #7249: deleteTypeDesignation needs to be transactional

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts