Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

Latest revisions

# Date Author Comment
d637e4ba 09/03/2015 05:11 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java...

36b5f7a3 09/02/2015 12:27 PM U-BGBM\k.luther

better messaging when convert person to team does not work

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

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

09f08a00 07/16/2015 05:54 PM Katja Luther

changes for #4908

e984ad30 07/16/2015 01:50 PM Katja Luther

changes for #4908

233a8fe2 07/02/2015 11:01 AM Cherian Mathew

#5012 Adding remoting session and updating save methods for Bulk Editor

Replace properties file with xml file

#5012 updates for making Bulk Editor remoting capable

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

View revisions

Also available in: Atom