taxeditor.git
6 years agoAllow null as parent when moving derivatives
Patrick Plitzner [Tue, 27 Oct 2015 14:35:25 +0000 (15:35 +0100)]
Allow null as parent when moving derivatives

6 years agoAdd check to make sure active session is not null
Cherian Mathew [Mon, 26 Oct 2015 17:25:30 +0000 (18:25 +0100)]
Add check to make sure active session is not null

6 years ago#5357 Add check to avoid transient object exception
Cherian Mathew [Mon, 26 Oct 2015 17:24:16 +0000 (18:24 +0100)]
#5357 Add check to avoid transient object exception

6 years ago#5349 Add getEditGeoService method
Cherian Mathew [Mon, 26 Oct 2015 17:23:13 +0000 (18:23 +0100)]
#5349 Add getEditGeoService method

6 years ago#5350 : Use newly added getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification...
Cherian Mathew [Mon, 26 Oct 2015 15:00:37 +0000 (16:00 +0100)]
#5350 : Use newly added getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification method with uuid

6 years ago#3771
Katja Luther [Mon, 26 Oct 2015 08:31:53 +0000 (09:31 +0100)]
#3771

6 years agofix #5342
Katja Luther [Thu, 22 Oct 2015 12:22:44 +0000 (14:22 +0200)]
fix #5342

6 years ago#5256 Set entity container in Bulk Editor to dirty when media is updated
Cherian Mathew [Wed, 21 Oct 2015 15:13:49 +0000 (17:13 +0200)]
#5256 Set entity container in Bulk Editor to dirty when media is updated

6 years ago#5256 Add missing recursive load for MergeResult lists, Add setting of dirty flag...
Cherian Mathew [Wed, 21 Oct 2015 14:55:48 +0000 (16:55 +0200)]
#5256 Add missing recursive load for MergeResult lists, Add setting of dirty flag for factual data in Buld Editor

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Wed, 21 Oct 2015 08:29:53 +0000 (10:29 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years agofix test for TaxonNavigator: all nodes need a taxon, except the topmost one
Katja Luther [Wed, 21 Oct 2015 08:29:15 +0000 (10:29 +0200)]
fix test for TaxonNavigator: all nodes need a taxon, except the topmost one

6 years agoDisable term menu when disconnected (#4901)
Patrick Plitzner [Tue, 20 Oct 2015 14:41:30 +0000 (16:41 +0200)]
Disable term menu when disconnected (#4901)

6 years ago#5301 Add merge call for saving new feature tree
Cherian Mathew [Mon, 19 Oct 2015 14:02:06 +0000 (16:02 +0200)]
#5301 Add merge call for saving new feature tree

6 years ago#5335 Use new getLanguageByLabel methof in term service
Cherian Mathew [Mon, 19 Oct 2015 13:33:50 +0000 (15:33 +0200)]
#5335 Use new getLanguageByLabel methof in term service

6 years ago#5306 Use default language if preferred language is null
Cherian Mathew [Mon, 19 Oct 2015 12:42:00 +0000 (14:42 +0200)]
#5306 Use default language if preferred language is null

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Thu, 15 Oct 2015 09:26:51 +0000 (11:26 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years agofix move taxonnode in natural order
Katja Luther [Thu, 15 Oct 2015 09:26:11 +0000 (11:26 +0200)]
fix move taxonnode in natural order

6 years ago#5268 Use convert methods which use uuids
Cherian Mathew [Wed, 14 Oct 2015 08:50:29 +0000 (10:50 +0200)]
#5268 Use convert methods which use uuids

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Wed, 14 Oct 2015 08:19:00 +0000 (10:19 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years agofix #5261 and minor
Katja Luther [Wed, 14 Oct 2015 08:18:06 +0000 (10:18 +0200)]
fix #5261 and minor

6 years agoFix setting of key statement
Cherian Mathew [Tue, 13 Oct 2015 15:39:34 +0000 (17:39 +0200)]
Fix setting of key statement

6 years agoPerformance tuning
Cherian Mathew [Tue, 13 Oct 2015 12:49:56 +0000 (14:49 +0200)]
Performance tuning

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Tue, 13 Oct 2015 10:48:18 +0000 (12:48 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years agofixing #5324 and #5325
Katja Luther [Tue, 13 Oct 2015 10:47:39 +0000 (12:47 +0200)]
fixing #5324 and #5325

6 years agoBind null session for new derived unit wizard
Cherian Mathew [Tue, 13 Oct 2015 09:16:11 +0000 (11:16 +0200)]
Bind null session for new derived unit wizard

6 years ago#5321 Add missing return statement for bad credentials
Cherian Mathew [Mon, 12 Oct 2015 14:46:33 +0000 (16:46 +0200)]
#5321 Add missing return statement for bad credentials

6 years ago#5320 Fix whitespace problem
Cherian Mathew [Mon, 12 Oct 2015 14:08:24 +0000 (16:08 +0200)]
#5320 Fix whitespace problem

6 years agoAdapt TaxEditor to use vocabulary term type instead of class: #3843.
Andreas Müller [Mon, 12 Oct 2015 13:07:20 +0000 (15:07 +0200)]
Adapt TaxEditor to use vocabulary term type instead of class: #3843.

6 years agoadd distinction between remote and standalone for getting the geoService
Katja Luther [Mon, 12 Oct 2015 11:22:06 +0000 (13:22 +0200)]
add distinction between remote and standalone for getting the geoService

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Mon, 12 Oct 2015 10:27:30 +0000 (12:27 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years agoadd moveDescription to transientService
Katja Luther [Mon, 12 Oct 2015 10:26:58 +0000 (12:26 +0200)]
add moveDescription to transientService

6 years agoAdd deproxy of entities in assertSame assertions
Cherian Mathew [Mon, 12 Oct 2015 08:57:50 +0000 (10:57 +0200)]
Add deproxy of entities in assertSame assertions

6 years agoremove Ignore on saveNewTerm test
Andreas Müller [Fri, 9 Oct 2015 13:42:14 +0000 (15:42 +0200)]
remove Ignore on saveNewTerm test

6 years agoCleanup DeleteOperation
Andreas Müller [Fri, 9 Oct 2015 13:41:09 +0000 (15:41 +0200)]
Cleanup DeleteOperation

6 years agoMerge branch 'master' into develop
Cherian Mathew [Fri, 9 Oct 2015 13:33:33 +0000 (15:33 +0200)]
Merge branch 'master' into develop

6 years agoRevert "Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT...
Cherian Mathew [Fri, 9 Oct 2015 12:29:09 +0000 (14:29 +0200)]
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.

6 years agoAdd missing files to ignore on merge conflict
Cherian Mathew [Fri, 9 Oct 2015 12:17:18 +0000 (14:17 +0200)]
Add missing files to ignore on merge conflict

6 years agoUpdated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and...
Cherian Mathew [Fri, 9 Oct 2015 12:07:06 +0000 (14:07 +0200)]
Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT

6 years agoAdd files to ignore on merge conflict if the 'ours' driver is configured
Cherian Mathew [Fri, 9 Oct 2015 11:55:17 +0000 (13:55 +0200)]
Add files to ignore on merge conflict if the 'ours' driver is configured

6 years agoAdd test for editor / server cdmlib version check
Cherian Mathew [Thu, 8 Oct 2015 16:18:38 +0000 (18:18 +0200)]
Add test for editor / server cdmlib version check

6 years ago#5302 Add cdm version and services version check
Cherian Mathew [Wed, 7 Oct 2015 14:43:53 +0000 (16:43 +0200)]
#5302 Add cdm version and services version check

6 years agoUpdate transient services for new load method
Cherian Mathew [Thu, 8 Oct 2015 14:54:04 +0000 (16:54 +0200)]
Update transient services for new load method

6 years ago#5309, #5310 Add load method to retrieve user entity after create and password change
Cherian Mathew [Thu, 8 Oct 2015 13:12:38 +0000 (15:12 +0200)]
#5309, #5310 Add load method to retrieve user entity after create and password change

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Thu, 8 Oct 2015 12:04:23 +0000 (14:04 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years agolast changes for #5114
Katja Luther [Thu, 8 Oct 2015 12:01:46 +0000 (14:01 +0200)]
last changes for #5114

6 years agoAdd load capability for MergeResult objects
Cherian Mathew [Thu, 8 Oct 2015 10:44:55 +0000 (12:44 +0200)]
Add load capability for MergeResult objects

6 years agoUpdate root entity merge calls to use new merge method.
Cherian Mathew [Thu, 8 Oct 2015 09:12:39 +0000 (11:12 +0200)]
Update root entity merge calls to use new merge method.

6 years agominor
Katja Luther [Thu, 8 Oct 2015 10:31:58 +0000 (12:31 +0200)]
minor

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Thu, 8 Oct 2015 08:38:55 +0000 (10:38 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years ago#5114 fix
Katja Luther [Thu, 8 Oct 2015 08:38:05 +0000 (10:38 +0200)]
#5114 fix

6 years agoUse convenience method for associated taxa
Patrick Plitzner [Wed, 7 Oct 2015 15:29:59 +0000 (17:29 +0200)]
Use convenience method for associated taxa

6 years agonew ErrorDialog for delete result messaging
Katja Luther [Wed, 7 Oct 2015 12:14:43 +0000 (14:14 +0200)]
new ErrorDialog for delete result messaging

6 years agoimprove messaging for deleteresults
Katja Luther [Wed, 7 Oct 2015 12:13:48 +0000 (14:13 +0200)]
improve messaging for deleteresults

6 years agominor
Katja Luther [Wed, 7 Oct 2015 10:34:54 +0000 (12:34 +0200)]
minor

6 years agocheck for isdeletable before set delete button disabled
Katja Luther [Wed, 7 Oct 2015 10:31:53 +0000 (12:31 +0200)]
check for isdeletable before set delete button disabled

6 years agoI18n of login and data source view
Patrick Plitzner [Tue, 6 Oct 2015 13:50:16 +0000 (15:50 +0200)]
I18n of login and data source view

6 years agoFix potential NPE
Patrick Plitzner [Tue, 6 Oct 2015 12:41:54 +0000 (14:41 +0200)]
Fix potential NPE

6 years agoFix named area filter for selection dialog (#2353)
Patrick Plitzner [Tue, 6 Oct 2015 12:06:34 +0000 (14:06 +0200)]
Fix named area filter for selection dialog (#2353)

6 years agocreate new taxonnode with reuse name or taxon now with more consistence enabled/disab...
Katja Luther [Tue, 6 Oct 2015 09:53:15 +0000 (11:53 +0200)]
create new taxonnode with reuse name or taxon now with more consistence enabled/disabled buttons

6 years agominor
Katja Luther [Tue, 6 Oct 2015 09:48:42 +0000 (11:48 +0200)]
minor

6 years agominor in TaxonNodeDetailElement
Katja Luther [Tue, 6 Oct 2015 09:40:05 +0000 (11:40 +0200)]
minor in TaxonNodeDetailElement

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Tue, 6 Oct 2015 09:15:55 +0000 (11:15 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years agomerge branches
Katja Luther [Tue, 6 Oct 2015 09:15:05 +0000 (11:15 +0200)]
merge branches

6 years agomerge branches
U-BGBM\k.luther [Tue, 6 Oct 2015 09:09:44 +0000 (11:09 +0200)]
merge branches

6 years agominor
U-BGBM\k.luther [Tue, 6 Oct 2015 08:47:25 +0000 (10:47 +0200)]
minor

6 years agoDisable expanding of key section (#3461)
Patrick Plitzner [Tue, 6 Oct 2015 07:21:04 +0000 (09:21 +0200)]
Disable expanding of key section (#3461)

6 years agoTrim code
Patrick Plitzner [Mon, 5 Oct 2015 13:55:26 +0000 (15:55 +0200)]
Trim code

6 years agomerge
U-BGBM\k.luther [Tue, 6 Oct 2015 08:58:00 +0000 (10:58 +0200)]
merge

6 years agominor
U-BGBM\k.luther [Tue, 6 Oct 2015 08:47:25 +0000 (10:47 +0200)]
minor

6 years agoin a selection element an disabled element can't be deleted so the delete button...
U-BGBM\k.luther [Tue, 6 Oct 2015 07:50:09 +0000 (09:50 +0200)]
in a selection element an disabled element can't be deleted so the delete button should be disabled too

6 years agoDisable expanding of key section (#3461)
Patrick Plitzner [Tue, 6 Oct 2015 07:21:04 +0000 (09:21 +0200)]
Disable expanding of key section (#3461)

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther [Tue, 6 Oct 2015 07:16:50 +0000 (09:16 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch

6 years agoimprove messaging for deleteResult
U-BGBM\k.luther [Tue, 6 Oct 2015 07:16:00 +0000 (09:16 +0200)]
improve messaging for deleteResult

6 years agoTrim code
Patrick Plitzner [Mon, 5 Oct 2015 13:55:26 +0000 (15:55 +0200)]
Trim code

6 years agoChange merge to standard call for new taxon node
Cherian Mathew [Mon, 5 Oct 2015 15:50:00 +0000 (17:50 +0200)]
Change merge to standard call for new taxon node

6 years agoAdd check for remoting before setting new entity listener
Cherian Mathew [Mon, 5 Oct 2015 13:05:23 +0000 (15:05 +0200)]
Add check for remoting before setting new entity listener

6 years agoAdd null check to handler (#5283)
Patrick Plitzner [Mon, 5 Oct 2015 11:29:08 +0000 (13:29 +0200)]
Add null check to handler (#5283)

6 years agoTrim code
Patrick Plitzner [Mon, 5 Oct 2015 11:27:28 +0000 (13:27 +0200)]
Trim code

6 years agoAdd null check to derivate label provider (#5271)
Patrick Plitzner [Mon, 5 Oct 2015 11:23:24 +0000 (13:23 +0200)]
Add null check to derivate label provider (#5271)

6 years agoDisable search bar when not connected to CDM store (#3341)
Patrick Plitzner [Mon, 5 Oct 2015 10:58:05 +0000 (12:58 +0200)]
Disable search bar when not connected to CDM store (#3341)

6 years agoAllow using the search bar only if at least one letter is entered
Patrick Plitzner [Mon, 5 Oct 2015 10:46:05 +0000 (12:46 +0200)]
Allow using the search bar only if at least one letter is entered
(#3341)

6 years agoDisable menu items when not connected to CDM store (#4901)
Patrick Plitzner [Mon, 5 Oct 2015 09:29:19 +0000 (11:29 +0200)]
Disable menu items when not connected to CDM store (#4901)

6 years agominor
U-BGBM\k.luther [Mon, 5 Oct 2015 07:38:49 +0000 (09:38 +0200)]
minor

6 years agoAdapt MediaSpecimen i18n
Patrick Plitzner [Fri, 2 Oct 2015 14:49:00 +0000 (16:49 +0200)]
Adapt MediaSpecimen i18n

6 years agoFix child hierarchy for DnaSamples
Patrick Plitzner [Fri, 2 Oct 2015 14:38:42 +0000 (16:38 +0200)]
Fix child hierarchy for DnaSamples

 - Fixed adding and displaying of sub derived units like e.g. media

6 years agoFix null selection for existing media
Patrick Plitzner [Fri, 2 Oct 2015 14:25:38 +0000 (16:25 +0200)]
Fix null selection for existing media

6 years ago#5282 Integrate remoting in referencing objects view
Cherian Mathew [Fri, 2 Oct 2015 16:59:14 +0000 (18:59 +0200)]
#5282 Integrate remoting in referencing objects view

6 years agoMerge branch 'hotfix/3.8.1' root/tags/taxeditor/3.8.1 3.8.1
jenkins [Fri, 2 Oct 2015 14:59:10 +0000 (16:59 +0200)]
Merge branch 'hotfix/3.8.1'

6 years agoupdating poms for branch'hotfix/3.8.1' with non-snapshot versions
jenkins [Fri, 2 Oct 2015 14:56:39 +0000 (16:56 +0200)]
updating poms for branch'hotfix/3.8.1' with non-snapshot versions

6 years agoRevert project versions to 3.8.1-SNAPSHOT
jenkins [Fri, 2 Oct 2015 14:55:41 +0000 (16:55 +0200)]
Revert project versions to 3.8.1-SNAPSHOT

6 years agoUpdated version in pom / project files to taxeditor version : 3.8.1 and cdmlib version :
jenkins [Fri, 2 Oct 2015 14:54:40 +0000 (16:54 +0200)]
Updated version in pom / project files to taxeditor version : 3.8.1 and cdmlib version :

6 years ago#5301 Fix null session issues, Add remoting session for feature tree editor
Cherian Mathew [Fri, 2 Oct 2015 14:50:50 +0000 (16:50 +0200)]
#5301 Fix null session issues, Add remoting session for feature tree editor

6 years agoAdapt transient services
Patrick Plitzner [Fri, 2 Oct 2015 13:47:43 +0000 (15:47 +0200)]
Adapt transient services

6 years agoAdd i18n files to build
Patrick Plitzner [Fri, 2 Oct 2015 13:32:18 +0000 (15:32 +0200)]
Add i18n files to build

6 years agoUpdated version in pom / project files to taxeditor version : 3.8.1-SNAPSHOT and...
jenkins [Fri, 2 Oct 2015 11:55:27 +0000 (13:55 +0200)]
Updated version in pom / project files to taxeditor version : 3.8.1-SNAPSHOT and cdmlib version :

6 years agoupdating poms for 3.8.1 branch with snapshot versions
jenkins [Fri, 2 Oct 2015 11:54:31 +0000 (13:54 +0200)]
updating poms for 3.8.1 branch with snapshot versions

6 years agoChange null session to singleton with no owner
Cherian Mathew [Fri, 2 Oct 2015 11:38:44 +0000 (13:38 +0200)]
Change null session to singleton with no owner

6 years agoUpdate transient services with new merge method
Cherian Mathew [Fri, 2 Oct 2015 09:24:48 +0000 (11:24 +0200)]
Update transient services with new merge method

6 years agoAdd remoting checks for merge, Move to merge call which returns updated transient...
Cherian Mathew [Fri, 2 Oct 2015 08:59:08 +0000 (10:59 +0200)]
Add remoting checks for merge, Move to merge call which returns updated transient object

6 years ago#5300 Implement remoting in Alignment Editor
Cherian Mathew [Thu, 1 Oct 2015 15:25:15 +0000 (17:25 +0200)]
#5300 Implement remoting in Alignment Editor