Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

taxeditor/eu.etaxonomy.taxeditor.editor @ 5bd41add

# Date Author Comment
7d8cee12 10/14/2015 10:18 AM Katja Luther

fix #5261 and minor
fd602c14 10/13/2015 12:47 PM Katja Luther

fixing #5324 and #5325
b18cb5fe 10/12/2015 12:26 PM Katja Luther

add moveDescription to transientService
45741193 10/09/2015 02:29 PM Cherian Mathew

Revert "Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT"

This reverts commit 9524fa3910c8335a6cbcb656f9aacaca01a3f5ca.
9524fa39 10/09/2015 02:07 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT
36ae5e03 10/08/2015 04:54 PM Cherian Mathew

Update transient services for new load method
6c95dd3d 10/08/2015 12:48 PM Cherian Mathew

Update root entity merge calls to use new merge method.
c40ece3e 10/08/2015 10:38 AM Katja Luther

Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
947bebd6 10/08/2015 10:38 AM Katja Luther

#5114 fix
e3a07c8a 10/07/2015 05:30 PM Patrick Plitzner

Use convenience method for associated taxa
8336cf65 10/07/2015 02:13 PM Katja Luther

improve messaging for deleteresults
8aac42d2 10/06/2015 03:50 PM Patrick Plitzner

I18n of login and data source view
d1fd5d18 10/06/2015 11:48 AM Katja Luther

minor
5395d49a 10/06/2015 11:15 AM Katja Luther

merge branches
c860d200 10/06/2015 10:58 AM U-BGBM\k.luther

merge
e68d8e76 10/06/2015 09:16 AM U-BGBM\k.luther

Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
369ac904 10/06/2015 09:16 AM U-BGBM\k.luther

improve messaging for deleteResult
676a8bf4 10/05/2015 01:29 PM Patrick Plitzner

Add null check to handler (#5283)
c0dba325 10/05/2015 01:27 PM Patrick Plitzner

Trim code
dd7f77fb 10/05/2015 11:29 AM Patrick Plitzner

Disable menu items when not connected to CDM store (#4901)
9d69a13b 10/05/2015 09:02 AM Patrick Plitzner

Adapt MediaSpecimen i18n
e9bfec4a 10/05/2015 09:02 AM Patrick Plitzner

Fix child hierarchy for DnaSamples

  • Fixed adding and displaying of sub derived units like e.g. media
5ce71816 10/05/2015 09:02 AM Patrick Plitzner

Fix null selection for existing media
dac7aeec 10/02/2015 03:47 PM Patrick Plitzner

Adapt transient services
a8911868 10/02/2015 11:24 AM Cherian Mathew

Update transient services with new merge method
fce7d237 10/02/2015 10:59 AM Cherian Mathew

Add remoting checks for merge, Move to merge call which returns updated transient object
79136a9f 10/01/2015 04:11 PM Patrick Plitzner

Correct derivative hierarchy context menu label
1e469223 10/01/2015 11:03 AM U-BGBM\k.luther

minor
421666b4 09/30/2015 03:43 PM Patrick Plitzner

Fix i18n (#5155)
79b22d9c 09/30/2015 01:01 PM U-BGBM\k.luther

Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
4537c26d 09/30/2015 01:00 PM U-BGBM\k.luther

move descriptions in a service call
a8933813 09/30/2015 12:49 PM Cherian Mathew

Add check to ensure merge in editors is performed only in remoting
abebca79 09/24/2015 11:05 AM Cherian Mathew

#5247 Fix duplicate entity issue for new entities by using the new merge service method which returns the input transient object
e7923b05 09/24/2015 11:05 AM Cherian Mathew

#5247 Use updated entities
28f75e33 09/22/2015 06:44 PM Cherian Mathew

Merge branch 'remoting-4.0' into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java
0c6a1a43 09/22/2015 10:01 AM Patrick Plitzner

Pre-select current classification for taxon node selection dialog
(#3462)
8393634c 09/22/2015 10:01 AM Patrick Plitzner

Delete unused method
34469274 09/22/2015 09:51 AM Patrick Plitzner

Expand polytomous key section #3461
8b6a0f21 09/22/2015 08:10 AM Patrick Plitzner

Fix media view selection
5a91da84 09/21/2015 09:57 AM Patrick Plitzner

Disable menu "New..." meun entries when no connection available (#4901)
a4350d13 09/21/2015 09:44 AM Patrick Plitzner

Disable media view when synonym selected (#5195)
12ebf505 09/21/2015 09:30 AM Patrick Plitzner

I18n for specimen editor (#5155)
c106c48b 09/16/2015 07:51 PM Cherian Mathew

Fix versions
a52450e2 09/16/2015 07:42 PM Cherian Mathew

Fix versions
999d37c4 09/16/2015 07:19 PM Cherian Mathew

Merge branch 'develop' 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
944a3fc3 09/16/2015 06:28 PM jenkins

Revert project versions to 3.11.0-SNAPSHOT
a22860ff 09/16/2015 06:27 PM jenkins

Updated version in pom / project files to taxeditor version : 3.12.0-SNAPSHOT and cdmlib version : 3.12.0-SNAPSHOT
09a9071b 09/16/2015 03:26 PM Patrick Plitzner

Add i18n to binary build path
f00fe291 09/16/2015 03:01 PM Cherian Mathew

Cache the default feature tree
ec3a353f 09/15/2015 08:38 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
d78805f8 09/15/2015 06:23 PM jenkins

updating poms for 3.11.0-SNAPSHOT development
6fc9689e 09/15/2015 06:22 PM jenkins

Revert project versions to 3.10.0-SNAPSHOT
995aa2c5 09/15/2015 06:21 PM jenkins

Updated version in pom / project files to taxeditor version : 3.11.0-SNAPSHOT and cdmlib version : 3.11.0-SNAPSHOT
5c0de6cc 09/15/2015 05:37 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0
ab6d805e 09/15/2015 05:07 PM Cherian Mathew

#5252 Add remove method to manually remove root derivate
8175c7f6 09/15/2015 02:48 PM Patrick Plitzner

Add missing i18n properties to build path
4ac90d61 09/15/2015 12:11 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
9f96b16e 09/15/2015 11:16 AM Patrick Plitzner

Fix initialization problems for preferences and editor input
e3bcf994 09/15/2015 10:55 AM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
34014ada 09/15/2015 10:54 AM Patrick Plitzner

Open a newly created specimen in specimen editor
1b8d0e4d 09/14/2015 06:02 PM jenkins

updating poms for 3.10.0-SNAPSHOT development
8c9356dc 09/14/2015 06:01 PM jenkins

Revert project versions to 3.9.0-SNAPSHOT
129e2ea3 09/14/2015 06:00 PM jenkins

Updated version in pom / project files to taxeditor version : 3.10.0-SNAPSHOT and cdmlib version : 3.10.0-SNAPSHOT
242020c0 09/14/2015 06:00 PM Cherian Mathew

re-initialise group object in input constructor
667025a5 09/14/2015 04:37 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
c9f13bde 09/14/2015 04:21 PM Cherian Mathew

#5242, #5223 Improve performance of derivate loading and editing
17653afc 09/14/2015 02:50 PM Patrick Plitzner

Use wizard to create new specimen
342606ca 09/14/2015 11:13 AM Patrick Plitzner

Keep media view and factual data view enabled when no significant
selection occurs (#5195)
2579f2ed 09/14/2015 11:04 AM Patrick Plitzner

Trim code
18358a52 09/10/2015 05:58 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
467d468b 09/10/2015 05:42 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
f27dd202 09/10/2015 05:00 PM jenkins

updating poms for 3.9.0-SNAPSHOT development
d14cdfb8 09/10/2015 04:59 PM jenkins

Revert project versions to 3.8.0-SNAPSHOT
4991d5fa 09/10/2015 04:57 PM jenkins

Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
627fcabe 09/10/2015 04:22 PM Andreas Kohlbecker

Revert "Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT"

This reverts commit 7ed2ce1e9eca6a9dd72c740e72efdcd6ef1135c9.
69040a4b 09/10/2015 04:22 PM Andreas Kohlbecker

Revert "Revert project versions to 3.8.0-SNAPSHOT"

This reverts commit e8268306693f047beef36ce53524adc00946cf74.
e8268306 09/10/2015 03:54 PM jenkins

Revert project versions to 3.8.0-SNAPSHOT
7ed2ce1e 09/10/2015 03:53 PM jenkins

Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
8347a92f 09/09/2015 03:17 PM Patrick Plitzner

Disable media view for taxon bulk editor with no selection (#5162)
34530272 09/09/2015 01:22 PM Patrick Plitzner

I18n for derivative module
e630b8f8 09/09/2015 01:22 PM Patrick Plitzner

I18n for Specimen Editor
8bd80bc8 09/09/2015 01:18 PM Cherian Mathew

Add new service call
dfb08879 09/09/2015 01:15 PM Cherian Mathew

#5224 Using new cdmlib call for changing synonym to accepted taxon
9f1df71f 09/08/2015 08:49 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java...
d9848a0c 09/08/2015 07:09 PM Cherian Mathew

Add unimplemented methods
bcc5b52f 09/08/2015 05:55 PM Cherian Mathew

#5213 Use method to move descriptions using uuids
67cad510 09/08/2015 05:54 PM Cherian Mathew

Add annotation service to config
33ec4d77 09/08/2015 03:34 PM Patrick Plitzner

Trim code
5535769b 09/07/2015 06:35 PM Cherian Mathew

Replace saveOrUpdate with merge
4a34b657 09/07/2015 03:29 PM Cherian Mathew

#5052 Integrate remoting in granted authorites editor
23d85b17 09/04/2015 10:37 AM Cherian Mathew

Fix new occurrence / sequence move method calls
1baeb336 09/04/2015 10:33 AM Cherian Mathew

Correct transient service method
94b8c8af 09/03/2015 07:07 PM Cherian Mathew

#5187 Use new move methods with uuids as args
025f3eb9 09/03/2015 06:31 PM Cherian Mathew

Update operation for move taxon nodes
41736211 09/03/2015 05:54 PM Cherian Mathew

Add unimplemented methods
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...
392048d6 09/03/2015 03:38 PM Cherian Mathew

#5188 Add special for deleting sequence
cd49ec22 09/03/2015 03:38 PM Cherian Mathew

#5186 Fix erros in sequence merge and creating new specimen
6b630b5f 09/03/2015 12:49 PM U-BGBM\k.luther

minor
31d3e34d 09/03/2015 11:57 AM U-BGBM\k.luther

change preferences page for taxonnode sort