cdmlibcdm-dataportalcdm-servercdm-vaadincdm-webappcdmlib-appsserver-scriptstaxeditortaxongraph-viewutis-clientutis-coreutis-webapp
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
Make background of icon transparent
Add icon for switching to advanced media view
#5007 : Integrated remoting handler / operations for taxon navigator ui
ICdmDataChangeService, CdmUIDataChangeService, CdmDataChangeService : added new data change service with different services for the ui and non-ui states CdmApplicationState, CdmStore : added data change service to app state CdmChangeEvent, ICdmChangeListener : added change listener and even to fire in case of data changes...
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: .gitattributes eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...
MANIFEST.MF : added apache commons exception package for use in messaging utils MessagingUtils : updated to add all causes in the child statuses
cleanup
Merge branch 'move-to-luna' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/build.properties eu.etaxonomy.taxeditor.cdmlib/pom.xml eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml...
View revisions
Also available in: Atom