Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

# Date Author Comment
e82bceda 08/26/2015 12:29 PM U-BGBM\k.luther

close the polytomouskey-editor if the key is deleted

6950e783 08/18/2015 02:45 PM U-BGBM\k.luther

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

69373790 08/18/2015 01:40 PM U-BGBM\k.luther

changes for move descriptions and description elements

ab499326 08/18/2015 01:35 PM Katja Luther

minor

926fd5b3 08/18/2015 07:51 AM Patrick Plitzner

Remove comments

7f0642d4 08/17/2015 02:56 PM Patrick Plitzner

Rename Derivative View to Derivative Editor

1924310e 08/13/2015 02:09 PM Katja Luther

fix jenkins

651bf830 08/13/2015 01:29 PM U-BGBM\k.luther

minor

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

fix delete polytomouskeynode and improve merge in bulk editor

399fd1a8 07/21/2015 01:46 PM Patrick Plitzner

Merge branch 'LibrAlign' into develop

244aacc4 07/21/2015 12:38 PM Patrick Plitzner

Remove cdmViewer extension usage

ad894907 07/21/2015 12:38 PM Patrick Plitzner

Set Visibility according to CdmStore connection

d54a2f48 07/21/2015 11:08 AM Patrick Plitzner

Remove cdmViewer extension usage

517ffc77 07/21/2015 11:08 AM Patrick Plitzner

Set Visibility according to CdmStore connection

3eaf9ce4 07/20/2015 01:18 PM Patrick Plitzner

merge-update from trunk

1a4acf08 07/20/2015 11:50 AM Cherian Mathew

Add unimplemented methods to transient service

a10ceea8 07/20/2015 10:57 AM Patrick Plitzner

merge-update from trunk

67de2353 07/17/2015 06:11 PM Cherian Mathew

Update transient service to be compatible with cdmlib service

9c0b77f7 07/17/2015 12:07 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

8a1dc5ff 07/17/2015 12:06 PM jenkins

Updating develop poms back to pre merge state

ae8eab5f 07/16/2015 11:36 AM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

d2c2fbfc 07/16/2015 11:35 AM jenkins

Updating develop poms back to pre merge state

16cd938f 07/15/2015 05:32 PM jenkins

updating poms for branch'release/3.7.0' with non-snapshot versions

58da2b7c 07/15/2015 05:31 PM jenkins

Revert project versions to 3.7.0-SNAPSHOT

c5685107 07/15/2015 05:30 PM jenkins

Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0

a3dc6527 07/15/2015 05:21 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

f63c8f53 07/15/2015 05:03 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

35f1bdd2 07/15/2015 05:02 PM jenkins

updating poms for 3.8.0-SNAPSHOT development

cc43d828 07/15/2015 05:00 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

34377444 07/15/2015 04:52 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

b7b91be9 07/15/2015 04:51 PM jenkins

updating poms for 3.8.0-SNAPSHOT development

2eeb388f 07/15/2015 04:50 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

4e1119d7 07/15/2015 04:03 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

29a6d25a 07/15/2015 04:01 PM jenkins

updating poms for 3.8.0-SNAPSHOT development

3dbbe399 07/15/2015 03:56 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

1927728a 07/15/2015 03:49 PM jenkins

updating poms for 3.8.0-SNAPSHOT development

de0ecbd7 07/15/2015 03:47 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

95d60366 07/15/2015 03:31 PM jenkins

updating poms for 3.8.0-SNAPSHOT development

880412d5 07/15/2015 03:29 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

5cf2562b 07/15/2015 03:17 PM jenkins

updating poms for 3.8.0-SNAPSHOT development

63b69f9e 07/15/2015 02:14 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

a2102722 07/15/2015 01:30 PM Patrick Plitzner

Reverted all LibrAlign changes (are now in molecular project)

4af5bc6a 07/15/2015 01:26 PM Patrick Plitzner

Reverted all LibrAlign changes (are now in molecular project)

a2a186f3 07/15/2015 12:43 PM Patrick Plitzner
  • removed dependencies to LibrAlign
28f22082 07/08/2015 02:50 PM Patrick Plitzner

merge-update from trunk

243636c2 07/07/2015 04:58 PM Patrick Plitzner

Refactor ICdmViewer framework

Removed unnecessary ExecutionEvent

483b8b8a 07/07/2015 02:57 PM Patrick Plitzner

Fix conversion of ShiftChanges to Shifts

4bf80c89 07/07/2015 02:13 PM Cherian Mathew

Make editor transient term service compatible with cdmlib term service

a72d93a2 07/07/2015 02:11 PM Patrick Plitzner

Use UUIDs instead of CDM objects in AlignmentEditorInput

This avoids session conflicts because the object will be loaded into the correct session when processing the editor input during initialization of the editor.

596a7252 07/07/2015 01:53 PM Patrick Plitzner

Re-load sequence to avoid session conflicts.

c2daa6e9 07/05/2015 10:55 PM Ben Stöver

Adjustments to recent module changes in bioinfweb.commons.

b4a380dc 07/03/2015 04:26 PM Ben Stöver

AlignmentEditor.createTestContents() marked as deprecated.

24adf92d 07/03/2015 12:28 PM Ben Stöver

InternalError thrown, if a single read alignment shall be saved that contains new single reads, which have been added in the AlignmentEditor. (Implementation does not make sense before the decision whether #4740, #4745 or #4746 shall be implemented.)

eaa4e421 07/03/2015 12:20 PM Ben Stöver

Error message added, if a pherogram URL loaded from CDM cannot be processed correctly.

eacfe31f 07/03/2015 12:09 PM Ben Stöver

Fixed NPE, if a single read has a pherogram object without URI.

2c5de69d 07/03/2015 12:04 PM Cherian Mathew

#5056 Adapt editor to service layer 'save' method refactoring in cdmlib

1f2cc436 07/02/2015 01:11 PM Ben Stöver

Adjustments to recent changes in LibrAlign.
(The additional project https://secure.bioinfweb.info/Code/svn/LibrAlign / trunk / main / info.bioinfweb.libralign.biojava1 needs to be in the workspace from now on.)

3c4d1aba 07/02/2015 11:21 AM Cherian Mathew

Make editor compatible with latest cdmlib service layer updates

36f17651 07/01/2015 06:06 PM Ben Stöver

Minor changes in implementation of AlignmentEditor.

70ab6696 07/01/2015 06:03 PM Ben Stöver

ShowPherogramHandler now also handles single reads without attached pherograms.

1ef6ef7a 07/01/2015 05:34 PM Ben Stöver

Support for empty alignments and single reads without pherograms added to AlignmentEditor.
DerivateLabelProvider now used to label single read sequences.

5e20d614 07/01/2015 11:34 AM Ben Stöver

Class path edited to include new modules from LibrAlign and TIC.

fa849b89 07/01/2015 11:31 AM Ben Stöver

Adjustments to recent architecture changes in TIC and LibrAlign. (TIC top level project referenced from now on.)

The following projects need to be checked out into the workspace from now on:

136811ac 07/01/2015 11:09 AM Patrick Plitzner

merge-update from trunk

94465d21 07/01/2015 09:44 AM Patrick Plitzner

Fix deletion of single reads in Derivative Editor

1bdc3970 07/01/2015 09:44 AM Patrick Plitzner

Add missing transient method

9efdbc29 06/30/2015 03:04 PM Patrick Plitzner

merge-update from trunk

3419670f 06/29/2015 03:25 PM Patrick Plitzner

merge-update from trunk

3e1ed38c 06/29/2015 02:53 PM Cherian Mathew

Update transient services with new delete method

501725be 06/29/2015 02:39 PM Patrick Plitzner

merge-update from trunk

42358e6e 06/26/2015 05:02 PM Ben Stöver

Adjustments to recent changes in TIC. (EDITor Code from now on written against unreleased TIC 2.x.)

4851a3ca 06/23/2015 05:58 PM Ben Stöver

Some actions for adjusting pherogram displaying added.

76456771 06/23/2015 01:11 PM Ben Stöver

PherogramViewPart that is started from within AlignmentEditor now uses a shared pherogram model to display cut positions.

ea8a5aa2 06/23/2015 01:01 PM Cherian Mathew

Fix issues with merge conflicts

790395af 06/23/2015 10:09 AM Cherian Mathew

Fixes from Katja for commit issue

6dbfba88 06/22/2015 06:21 PM Ben Stöver

Position properties of LibrAlign pherogram models are now connected to according CDM node properties (yet untested).

2f56c6db 06/22/2015 03:50 PM Patrick Plitzner

adapt service call to model change

e1623027 06/22/2015 03:49 PM Patrick Plitzner

adapt transient service methods to cdmlib changes

c951d62c 06/22/2015 01:16 PM Ben Stöver

Adjustments to recent changes in LibrAlign.

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

ecce3492 06/19/2015 12:42 PM Ben Stöver

Actions for creating and updating the consensus sequence in AlignmentEditor implemented.

d8c84690 06/19/2015 11:11 AM Ben Stöver

AbstractAlignmentEditorHandler added.

61ec9fa7 06/17/2015 03:52 PM Patrick Plitzner

merge-update from trunk

c31e35b4 06/17/2015 03:31 PM Ben Stöver

ToggleInsertOverwriteHandler now also triggers enabling and disabling of ToggleLeftRightInsertionHandler when the insert key is used instead of the tool bar button.
Actions for cutting pherograms on the left and right ends added.
Action for reverse complementing single reads added....

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)
169640eb 06/15/2015 10:52 AM Ben Stöver

Icons added for insert/overwrite button in AlignmentEditor tool bar.
Insert left/right in pherogram disabled when switching to overwrite mode.

dda239c0 06/14/2015 03:17 PM Ben Stöver

Adjustments to recent changes in LibrAlign.

55a1a227 06/11/2015 03:39 PM Ben Stöver

Further adjustments to recent changes in LibrAlign.

76543dac 06/08/2015 04:50 PM Ben Stöver

Adjustments to recent changes in LibrAlign.

45ab0adb 06/08/2015 01:57 PM Patrick Plitzner

merge-update from trunk

91a93eb2 06/08/2015 01:46 PM Patrick Plitzner

merge-update from trunk

efedd195 06/08/2015 01:00 PM Cherian Mathew

fixed manifest versions

e8458b29 06/05/2015 06:16 PM Cherian Mathew

Updating develop poms back to pre merge state

0c924c07 06/05/2015 06:16 PM Cherian Mathew

updating poms for branch'hotfix/3.6.1' with non-snapshot versions

dba3d0c2 06/05/2015 05:55 PM Cherian Mathew

updating poms for branch '3.6.1' with snapshot versions

5b9d4ad5 06/05/2015 04:42 PM Cherian Mathew

Release 3.6.0 merge

5f02ad3e 06/04/2015 03:55 PM Cherian Mathew

updated to snapshot version

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

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath

02176688 06/04/2015 03:49 PM edit-jenkins

Updated version in config files to 3.6.1-SNAPSHOT