cdmlibcdm-dataportalcdm-servercdm-vaadincdm-webappcdmlib-appsserver-scriptstaxeditortaxongraph-viewutis-clientutis-coreutis-webapp
minor clean ups
Adapt listeners and tests to new pre-insert strategy #5066
Merge branch 'develop' into ticket-5066
Conflicts: cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java
Set transient id for root merge object
resolving conficts in project versions after hotfixrelease
#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods
Revert "#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods" since this commit needs to be in a hotfix release.
This reverts commit 2693f7105470815383cdf485355e7fc5ad81ed68.
Add a new merge method in the service base class which allows the option to return the transient object
Allow retrieving objects via ICommonService and UUID (#5160)
View revisions
Also available in: Atom