taxeditor.git
8 years agoFix typo
Patrick Plitzner [Wed, 24 Jun 2015 12:18:47 +0000 (14:18 +0200)]
Fix typo

8 years ago#5036 Add missing command for polytomous key delete
Cherian Mathew [Fri, 26 Jun 2015 15:49:01 +0000 (17:49 +0200)]
#5036 Add missing command for polytomous key delete

8 years agoFix remoting code compilation errors
Cherian Mathew [Thu, 25 Jun 2015 15:21:07 +0000 (17:21 +0200)]
Fix remoting code compilation errors

8 years agoMerge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
Patrick Plitzner [Wed, 24 Jun 2015 12:19:58 +0000 (14:19 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

8 years agoEmpty text fields return empty string and not null
Patrick Plitzner [Wed, 24 Jun 2015 12:19:43 +0000 (14:19 +0200)]
Empty text fields return empty string and not null

8 years agoRevert "index on develop: 6992bef Rename NonViralName authorteams to authorship ...
k.luther [Wed, 24 Jun 2015 11:08:18 +0000 (13:08 +0200)]
Revert "index on develop: 6992bef Rename NonViralName authorteams to authorship #4968"

This reverts commit 32cded397931ad359f7818fdfb91a113a074342e.

8 years agoRename NonViralName authorteams to authorship #4968
Andreas Müller [Tue, 23 Jun 2015 16:34:38 +0000 (18:34 +0200)]
Rename NonViralName authorteams to authorship #4968

8 years agoUpdate cdmlib version to 3.6.3-SNAPSHOT
Cherian Mathew [Tue, 23 Jun 2015 16:22:30 +0000 (18:22 +0200)]
Update cdmlib version to 3.6.3-SNAPSHOT

8 years agoDelete renamed file
Cherian Mathew [Tue, 23 Jun 2015 12:45:38 +0000 (14:45 +0200)]
Delete renamed file

8 years agoFix issues with merge conflicts
Cherian Mathew [Tue, 23 Jun 2015 11:01:02 +0000 (13:01 +0200)]
Fix issues with merge conflicts

8 years agoFixes from Katja for commit issue
Cherian Mathew [Tue, 23 Jun 2015 08:09:36 +0000 (10:09 +0200)]
Fixes from Katja for commit issue

8 years agoFix problem with non persisted taxon titleCache change: #5018
Andreas Müller [Mon, 22 Jun 2015 14:35:17 +0000 (16:35 +0200)]
Fix problem with non persisted taxon titleCache change: #5018

8 years agoadapt service call to model change
Patrick Plitzner [Mon, 22 Jun 2015 13:50:09 +0000 (15:50 +0200)]
adapt service call to model change

8 years agoadapt transient service methods to cdmlib changes
Patrick Plitzner [Mon, 22 Jun 2015 13:49:50 +0000 (15:49 +0200)]
adapt transient service methods to cdmlib changes

8 years ago - update parent scroll form on property change (fixes #4881)
Patrick Plitzner [Mon, 22 Jun 2015 12:38:25 +0000 (14:38 +0200)]
 - update parent scroll form on property change (fixes #4881)

8 years ago - removed initial expand of sections
Patrick Plitzner [Mon, 22 Jun 2015 06:56:23 +0000 (08:56 +0200)]
 - removed initial expand of sections

8 years ago - fixed potential NPE
Patrick Plitzner [Mon, 22 Jun 2015 06:50:16 +0000 (08:50 +0200)]
 - fixed potential NPE

8 years ago - fixed potential NPE
Patrick Plitzner [Mon, 22 Jun 2015 05:54:33 +0000 (07:54 +0200)]
 - fixed potential NPE

8 years ago - changed type of "Materials & Methods" to text instead of DefinedTerm
Patrick Plitzner [Wed, 17 Jun 2015 15:35:46 +0000 (17:35 +0200)]
 - changed type of "Materials & Methods" to text instead of DefinedTerm
 - fixed label

8 years ago - split off "Preparation/Preservation section" from dna sample general
Patrick Plitzner [Wed, 17 Jun 2015 15:27:48 +0000 (17:27 +0200)]
 - split off "Preparation/Preservation section" from dna sample general
section

8 years agofixed conflicts from last commit
Cherian Mathew [Mon, 22 Jun 2015 09:31:26 +0000 (11:31 +0200)]
fixed conflicts from last commit

8 years agoall delete methods need an Uuid as argument
Katja Luther [Thu, 18 Jun 2015 13:28:35 +0000 (15:28 +0200)]
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
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
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/TransientReferenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java

8 years agochange delete argument to UUID
Katja Luther [Thu, 18 Jun 2015 13:15:42 +0000 (15:15 +0200)]
change delete argument to UUID

8 years agoadd empty test folder
Andreas Müller [Fri, 19 Jun 2015 13:15:04 +0000 (15:15 +0200)]
add empty test folder

8 years agoMerge remote-tracking branch 'origin/develop' into develop
Andreas Müller [Thu, 18 Jun 2015 13:22:24 +0000 (15:22 +0200)]
Merge remote-tracking branch 'origin/develop' into develop

8 years agominor
Andreas Müller [Thu, 18 Jun 2015 13:04:56 +0000 (15:04 +0200)]
minor

8 years agoMerge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
Patrick Plitzner [Tue, 16 Jun 2015 12:04:22 +0000 (14:04 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

8 years agofixing for compatibility with merged cdmlib
Cherian Mathew [Tue, 16 Jun 2015 11:53:53 +0000 (13:53 +0200)]
fixing for compatibility with merged cdmlib

8 years ago - added transient service methods
Patrick Plitzner [Mon, 15 Jun 2015 14:11:56 +0000 (16:11 +0200)]
 - added transient service methods

8 years agoadd empty folder
Andreas Müller [Mon, 15 Jun 2015 13:23:54 +0000 (15:23 +0200)]
add empty folder

8 years ago - fixed order of team members #4936
Patrick Plitzner [Mon, 15 Jun 2015 13:08:22 +0000 (15:08 +0200)]
 - fixed order of team members #4936

8 years ago - fixed NPE (#4937)
Patrick Plitzner [Mon, 15 Jun 2015 12:31:29 +0000 (14:31 +0200)]
 - fixed NPE (#4937)

8 years ago - removed inBetween target for Derivative Editor (fixes #4966)
Patrick Plitzner [Mon, 15 Jun 2015 10:46:37 +0000 (12:46 +0200)]
 - removed inBetween target for Derivative Editor (fixes #4966)

8 years ago - removed test folder
Patrick Plitzner [Mon, 15 Jun 2015 07:56:34 +0000 (09:56 +0200)]
 - removed test folder

8 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Patrick Plitzner [Mon, 15 Jun 2015 07:49:29 +0000 (09:49 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

8 years ago - removed test folder from classpatch
pplitzner [Mon, 15 Jun 2015 07:46:19 +0000 (09:46 +0200)]
 - removed test folder from classpatch

8 years agofix umlaute in key menus and add gitignore for rcp.target
Andreas Müller [Fri, 12 Jun 2015 15:37:21 +0000 (17:37 +0200)]
fix umlaute in key menus and add gitignore for rcp.target

8 years agofixed manifest versions
Cherian Mathew [Mon, 8 Jun 2015 11:00:15 +0000 (13:00 +0200)]
fixed manifest versions

8 years agonew .gitignore file
Cherian Mathew [Mon, 8 Jun 2015 10:22:13 +0000 (12:22 +0200)]
new .gitignore file

8 years agoremoved test source from classpath
Cherian Mathew [Mon, 8 Jun 2015 10:20:28 +0000 (12:20 +0200)]
removed test source from classpath

8 years agofixed update to snapshot
Cherian Mathew [Mon, 8 Jun 2015 10:13:56 +0000 (12:13 +0200)]
fixed update to snapshot

8 years agocorrected cdmlib version to snapshot
Cherian Mathew [Mon, 8 Jun 2015 08:26:47 +0000 (10:26 +0200)]
corrected cdmlib version to snapshot

8 years agoUpdating develop poms back to pre merge state
Cherian Mathew [Fri, 5 Jun 2015 16:16:58 +0000 (18:16 +0200)]
Updating develop poms back to pre merge state

8 years agoMerge branch 'master' into develop
Cherian Mathew [Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)]
Merge branch 'master' into develop

8 years agoUpdating develop poms to hotfix version to avoid merge conflicts
Cherian Mathew [Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)]
Updating develop poms to hotfix version to avoid merge conflicts

8 years agoMerge branch 'hotfix/3.6.1'
Cherian Mathew [Fri, 5 Jun 2015 16:16:56 +0000 (18:16 +0200)]
Merge branch 'hotfix/3.6.1'

8 years agoupdating poms for branch'hotfix/3.6.1' with non-snapshot versions
Cherian Mathew [Fri, 5 Jun 2015 16:16:54 +0000 (18:16 +0200)]
updating poms for branch'hotfix/3.6.1' with non-snapshot versions

8 years agoversion updates for 3.6.1
Cherian Mathew [Fri, 5 Jun 2015 16:15:54 +0000 (18:15 +0200)]
version updates for 3.6.1

8 years agoupdating poms for branch '3.6.1' with snapshot versions
Cherian Mathew [Fri, 5 Jun 2015 15:55:12 +0000 (17:55 +0200)]
updating poms for branch '3.6.1' with snapshot versions

8 years agofixing classpath config
Cherian Mathew [Fri, 5 Jun 2015 15:53:49 +0000 (17:53 +0200)]
fixing classpath config

8 years agofixing classpath config
Cherian Mathew [Fri, 5 Jun 2015 15:51:50 +0000 (17:51 +0200)]
fixing classpath config

8 years agoRelease 3.6.0 merge root/tags/taxeditor/3.6.0 3.6.0
Cherian Mathew [Fri, 5 Jun 2015 14:42:11 +0000 (16:42 +0200)]
Release 3.6.0 merge

8 years agomerged jgitfow plugin
Cherian Mathew [Fri, 5 Jun 2015 14:31:17 +0000 (16:31 +0200)]
merged jgitfow plugin

8 years agomerged for gitflow plugin
Cherian Mathew [Fri, 5 Jun 2015 14:12:48 +0000 (16:12 +0200)]
merged for gitflow plugin

8 years agoadded jgitflow plugin
Cherian Mathew [Fri, 5 Jun 2015 14:07:00 +0000 (16:07 +0200)]
added jgitflow plugin

8 years ago - updating versions due to release
Patric Plitzner [Thu, 4 Jun 2015 16:43:56 +0000 (16:43 +0000)]
 - updating versions due to release

8 years agoupdated to snapshot version
Cherian Mathew [Thu, 4 Jun 2015 13:55:14 +0000 (15:55 +0200)]
updated to snapshot version

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

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

8 years agoUpdated version in config files to 3.6.1-SNAPSHOT attic/trunk/taxeditor/24113
edit-jenkins [Thu, 4 Jun 2015 13:49:43 +0000 (13:49 +0000)]
Updated version in config files to 3.6.1-SNAPSHOT

8 years agoMerge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop
Cherian Mathew [Thu, 4 Jun 2015 13:30:07 +0000 (15:30 +0200)]
Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

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

8 years agoUpdated version in config files to 3.6.0
edit-jenkins [Thu, 4 Jun 2015 12:58:53 +0000 (12:58 +0000)]
Updated version in config files to 3.6.0

8 years ago - added wizard page listener to react on ENTER key #4853
Patric Plitzner [Thu, 4 Jun 2015 11:23:45 +0000 (11:23 +0000)]
 - added wizard page listener to react on ENTER key #4853

8 years ago - added wizard page listener to react on ENTER key #4853
Patric Plitzner [Thu, 4 Jun 2015 10:57:39 +0000 (10:57 +0000)]
 - added wizard page listener to react on ENTER key #4853

8 years ago - added context menu entry for editing classifications
Patric Plitzner [Thu, 4 Jun 2015 10:54:32 +0000 (10:54 +0000)]
 - added context menu entry for editing classifications
 - used generic extension point for cdmViewer in navigation project (#4865)

8 years ago - code conventions
Patric Plitzner [Thu, 4 Jun 2015 10:52:43 +0000 (10:52 +0000)]
 - code conventions

8 years ago - code conventions
Patric Plitzner [Thu, 4 Jun 2015 10:50:56 +0000 (10:50 +0000)]
 - code conventions

8 years agominor
Katja Luther [Thu, 4 Jun 2015 09:39:48 +0000 (09:39 +0000)]
minor

8 years agoadd checkbox for additional team members
Katja Luther [Thu, 4 Jun 2015 09:09:52 +0000 (09:09 +0000)]
add checkbox for additional team members

8 years agochange synonym to accepted taxon message when taxon could not be deleted
Katja Luther [Wed, 3 Jun 2015 13:22:24 +0000 (13:22 +0000)]
change synonym to accepted taxon message when taxon could not be deleted

8 years agodelete taxonnode if taxon is used somewhere else fixed
Katja Luther [Wed, 3 Jun 2015 13:19:59 +0000 (13:19 +0000)]
delete taxonnode if taxon is used somewhere else fixed

8 years ago #4725
Katja Luther [Wed, 3 Jun 2015 07:55:09 +0000 (07:55 +0000)]
 #4725

8 years agominor
Katja Luther [Tue, 2 Jun 2015 12:51:38 +0000 (12:51 +0000)]
minor

8 years agofix for #3998
Katja Luther [Tue, 2 Jun 2015 09:43:50 +0000 (09:43 +0000)]
fix for #3998

8 years ago - fixed compile error and possible NPE #4810
Patric Plitzner [Mon, 1 Jun 2015 08:05:33 +0000 (08:05 +0000)]
 - fixed compile error and possible NPE #4810

8 years agoMANIFEST.MF : added apache commons exception package for use in messaging utils
Cherian Mathew [Fri, 29 May 2015 16:33:14 +0000 (18:33 +0200)]
MANIFEST.MF : added apache commons exception package for use in messaging utils
MessagingUtils : updated to add all causes in the child statuses

8 years agoMerge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor
Cherian Mathew [Fri, 29 May 2015 14:21:50 +0000 (16:21 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor

8 years agoDefinedTermDropAdapter : added selection of source objects after drop and disabled...
Cherian Mathew [Fri, 29 May 2015 14:16:34 +0000 (16:16 +0200)]
DefinedTermDropAdapter : added selection of source objects after drop and disabled insert feedback for non OrderedTermBase objects
DefinedTermEditor : added custom sorter for OrderedTermBase (descending)
MoveDefinedTermOperation : added possibility to move term when cursor is in the insert part of the list

8 years agonew session for every search in bulk editor
Katja Luther [Thu, 28 May 2015 12:08:37 +0000 (12:08 +0000)]
new session for every search in bulk editor

8 years agoImprove error message
Andreas M��ller [Thu, 28 May 2015 11:58:16 +0000 (11:58 +0000)]
Improve error message

8 years agoMerge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor
Cherian Mathew [Thu, 28 May 2015 11:14:15 +0000 (13:14 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor

8 years agoreplaced simple editor-datasource compatibility check with version comparison check
Cherian Mathew [Thu, 28 May 2015 11:13:24 +0000 (13:13 +0200)]
replaced simple editor-datasource compatibility check with version comparison check

8 years agofixing the disabling of the ToggleableTextElement when the titlecache is protected.
Katja Luther [Thu, 28 May 2015 09:09:42 +0000 (09:09 +0000)]
fixing the disabling of the ToggleableTextElement when the titlecache is protected.

8 years agofix potential NPE
Andreas M��ller [Thu, 28 May 2015 08:28:59 +0000 (08:28 +0000)]
fix potential NPE

8 years agocleanup
Andreas M��ller [Wed, 27 May 2015 16:18:28 +0000 (16:18 +0000)]
cleanup

8 years agominor
Andreas M��ller [Wed, 27 May 2015 16:10:04 +0000 (16:10 +0000)]
minor

8 years agoclean up
Andreas M��ller [Wed, 27 May 2015 16:09:35 +0000 (16:09 +0000)]
clean up

8 years agoRenaming menu labels for new team and person
Andreas M��ller [Wed, 27 May 2015 15:52:31 +0000 (15:52 +0000)]
Renaming menu labels for new team and person

8 years agouse plural for bulk editor labels
Andreas M��ller [Wed, 27 May 2015 15:11:31 +0000 (15:11 +0000)]
use plural for bulk editor labels

8 years agominor
Andreas M��ller [Wed, 27 May 2015 15:00:04 +0000 (15:00 +0000)]
minor

8 years ago - fixed preferences for adding vocabulary name to term label #4448
Patric Plitzner [Wed, 27 May 2015 12:09:35 +0000 (12:09 +0000)]
 - fixed preferences for adding vocabulary name to term label #4448

8 years ago - added preferences for vocabulary names in term labels #4448
Patric Plitzner [Wed, 27 May 2015 07:12:05 +0000 (07:12 +0000)]
 - added preferences for vocabulary names in term labels #4448

8 years ago - combo dropdowns intitially show an empty field which is now removed when selecting...
Patric Plitzner [Wed, 27 May 2015 06:54:07 +0000 (06:54 +0000)]
 - combo dropdowns intitially show an empty field which is now removed when selecting any other entry
 - added vocabulary information to term label #4448

8 years ago - removed empty element from combo dropdown #4448
Patric Plitzner [Tue, 26 May 2015 15:07:14 +0000 (15:07 +0000)]
 - removed empty element from combo dropdown #4448

8 years agomoving UuidAndTitleCache from model to persistence (changes in Editor). #4799
Andreas M��ller [Tue, 26 May 2015 11:42:57 +0000 (11:42 +0000)]
moving UuidAndTitleCache from model to persistence (changes in Editor). #4799

8 years ago - initially expand modifier section if modifiers exist #4448
Patric Plitzner [Tue, 26 May 2015 10:52:36 +0000 (10:52 +0000)]
 - initially expand modifier section if modifiers exist #4448

8 years ago - moved OriginalLabel above sources #4776
Patric Plitzner [Tue, 26 May 2015 10:40:46 +0000 (10:40 +0000)]
 - moved OriginalLabel above sources #4776

8 years ago - fixed copy&paste error #4799
Patric Plitzner [Tue, 26 May 2015 10:38:25 +0000 (10:38 +0000)]
 - fixed copy&paste error #4799

8 years ago - refactored naming of modifier section #4448
Patric Plitzner [Tue, 26 May 2015 09:40:10 +0000 (09:40 +0000)]
 - refactored naming of modifier section #4448

8 years ago - fixed NPE (#4448)
Patric Plitzner [Tue, 26 May 2015 09:30:38 +0000 (09:30 +0000)]
 - fixed NPE (#4448)

8 years ago - fixed NPE (#4883)
Patric Plitzner [Tue, 26 May 2015 08:59:50 +0000 (08:59 +0000)]
 - fixed NPE (#4883)

8 years ago - added identifier section to specimen details view
Patric Plitzner [Tue, 26 May 2015 08:52:11 +0000 (08:52 +0000)]
 - added identifier section to specimen details view