cdmlibcdm-dataportalcdm-servercdm-vaadincdm-webappcdmlib-appsedit-svntaxeditortaxongraph-view
fix #3465 implement setSecundumForSubtree
adapt gestGetUuidAndTitleCache data to new model
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop
Conflicts: cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
ref #2380 Implement service for getting parent of UuidAndTitleCache
Cleanup merge model 4.1/develop
Merge remote-tracking branch 'origin/develop' into develop
Conflicts: cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java...
remaining merge issue for morge develop to cdm4.1
Merge remote-tracking branch 'origin/develop' into cdm-4.1
Conflicts: cdmlib-db/pom.xml cdmlib-ext/pom.xml cdmlib-io/pom.xml cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java...
ref #3925 Adapt tests for moving unplaced and excluded
ref #6099: removing cascading to child nodes and adapting the service and persistence layer
View revisions
Also available in: Atom