cdmlibcdm-dataportalcdm-servercdm-vaadincdm-webappcdmlib-appsserver-scriptstaxeditortaxongraph-viewutis-clientutis-coreutis-webapp
Merge branch 'phycobank' into develop
Conflicts: src/main/java/eu/etaxonomy/cdm/mock/Registration.java src/main/java/eu/etaxonomy/cdm/mock/RegistrationService.java src/main/java/eu/etaxonomy/cdm/vaadin/model/DbTableDTO.java src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/RegistrationWorkingSet.java...
adapt vaadin to model changes 4.7
ref #6169 first attempt to impement prester tests - not working yet
cleanup
ref #5974 remove synonym relationship and other model changes
ref #5974 Remove synonym relationships
updated test db for new model changes and updated test data accordingly
NewTaxonBasePresenterTest.xml : adjusted ids in test data to avoid unique key issue unitils.properties : reverted back to standard h2 jdbs driver
NewTaxonBaseComposite : add exception handling when name already exists StatusComposite : added tab sheet with main / excluded tabs CdmQueryFactory, LeafNodeTaxonContainer : added rank filter for ranks below species aggregate NewTaxonBasePresenter : added check if name exists...
ConceptRelationshipComposite, ConceptRelationshipView : using source from event to set primary composite LeafNodeTaxonContainer : checking for nulls SelectionEvent : added source object as member StatusComposite : adding component as source instead of in the list of objects...
View revisions
Also available in: Atom