Project

General

Profile

Statistics
| Branch: | Tag: | Revision:
Name Size
  main
  test

Latest revisions

# Date Author Comment
b13da0b9 06/22/2015 04:58 PM Cherian Mathew

#5007 : Add remoting handler / operations for the taxon navigator

c36e67ab 06/22/2015 12:51 PM Cherian Mathew

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java...

1706bc52 06/22/2015 11:31 AM Cherian Mathew

fixed conflicts from last commit

562118a0 06/22/2015 11:30 AM Katja Luther

all delete methods need an Uuid as argument

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java...

ae7e2680 06/19/2015 10:43 AM Cherian Mathew

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...

dde2b107 06/18/2015 03:17 PM Cherian Mathew

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/.gitignore
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java...

79e8baa5 06/15/2015 04:11 PM Patrick Plitzner
  • added transient service methods
d4770c1f 06/15/2015 12:46 PM Patrick Plitzner
  • removed inBetween target for Derivative Editor (fixes #4966)
c5485129 06/09/2015 09:32 AM Cherian Mathew

fixed classpath issues and issues from last merge

43c0aada 06/05/2015 01:23 PM Cherian Mathew

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...

View revisions

Also available in: Atom