Project

General

Profile

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

Latest revisions

# Date Author Comment
76fe3732 08/27/2015 04:12 PM Cherian Mathew

#5161 Fix problem of new entity not refreshed

317a1bcb 08/26/2015 11:03 AM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

0bb254ee 08/25/2015 01:28 PM Cherian Mathew

#5160 Use new merge method with ids as arguments

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

3a8e076a 08/25/2015 01:09 PM Cherian Mathew

#5160 Use new merge method with ids as arguments

7d7c5562 08/24/2015 11:34 AM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java...

caddd4f3 08/24/2015 10:39 AM Patrick Plitzner

Trim code

3c258b8a 08/24/2015 10:39 AM Patrick Plitzner

Remove comments

1dc79a5e 08/13/2015 01:20 PM Katja Luther

fix delete polytomouskeynode and improve merge in bulk editor

6cf98995 07/20/2015 11:00 AM Cherian Mathew

Correct issues from last merge

ad69c198 07/17/2015 06:07 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF...

View revisions

Also available in: Atom