Patrick Plitzner [Tue, 27 Oct 2015 09:46:20 +0000 (10:46 +0100)]
Merge branch 'develop' into unify_derivative_views
Patrick Plitzner [Tue, 27 Oct 2015 09:45:04 +0000 (10:45 +0100)]
Implement handler for creating (non-)taxon associated FieldUnits
Patrick Plitzner [Tue, 27 Oct 2015 07:26:14 +0000 (08:26 +0100)]
Add dynamic context menu entry for FieldUnit creation
Patrick Plitzner [Mon, 26 Oct 2015 17:53:27 +0000 (18:53 +0100)]
Update taxon name in taxon selection element
Patrick Plitzner [Mon, 26 Oct 2015 17:42:41 +0000 (18:42 +0100)]
Fix taxon assignment filter
Cherian Mathew [Mon, 26 Oct 2015 17:25:30 +0000 (18:25 +0100)]
Add check to make sure active session is not null
Cherian Mathew [Mon, 26 Oct 2015 17:24:16 +0000 (18:24 +0100)]
#5357 Add check to avoid transient object exception
Cherian Mathew [Mon, 26 Oct 2015 17:23:13 +0000 (18:23 +0100)]
#5349 Add getEditGeoService method
Patrick Plitzner [Mon, 26 Oct 2015 17:21:08 +0000 (18:21 +0100)]
Removed OccurrenceView
Patrick Plitzner [Mon, 26 Oct 2015 15:58:17 +0000 (16:58 +0100)]
Fix session problems with remoting
Cherian Mathew [Mon, 26 Oct 2015 15:00:37 +0000 (16:00 +0100)]
#5350 : Use newly added getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification method with uuid
Patrick Plitzner [Mon, 26 Oct 2015 14:12:52 +0000 (15:12 +0100)]
Add toggle button for link with editor
- search bar will be disabled when linked to editor
- also fixed tree initialization when listening to selection changes
Patrick Plitzner [Mon, 26 Oct 2015 13:50:23 +0000 (14:50 +0100)]
Merge branch 'develop' into unify_derivative_views
Patrick Plitzner [Mon, 26 Oct 2015 10:22:07 +0000 (11:22 +0100)]
Listen to selection changes in DerivateEditor
Patrick Plitzner [Mon, 26 Oct 2015 09:23:43 +0000 (10:23 +0100)]
Listen to selection changes in DerivativeEditor
- Convert to ViewPart
- Add toolbar button to toggle listening to selection changes
Katja Luther [Mon, 26 Oct 2015 08:31:53 +0000 (09:31 +0100)]
#3771
Patrick Plitzner [Mon, 26 Oct 2015 07:40:00 +0000 (08:40 +0100)]
Add conversation/session support to OccurenceView
Katja Luther [Thu, 22 Oct 2015 12:22:44 +0000 (14:22 +0200)]
fix #5342
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
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
Patrick Plitzner [Wed, 21 Oct 2015 12:19:58 +0000 (14:19 +0200)]
Enable remote session support
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
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
Patrick Plitzner [Wed, 21 Oct 2015 07:13:12 +0000 (09:13 +0200)]
Enhance search bar layout
Patrick Plitzner [Wed, 21 Oct 2015 06:36:44 +0000 (08:36 +0200)]
Implement taxon assignment filter and refactor DerivativeEditor
- Input no longer needs session
- editor itself keeps track of its root elements
- taxon assignment filter allows filtering specimens with/without taxon
assignment or both
Patrick Plitzner [Tue, 20 Oct 2015 14:41:30 +0000 (16:41 +0200)]
Disable term menu when disconnected (#4901)
Patrick Plitzner [Tue, 20 Oct 2015 09:31:49 +0000 (11:31 +0200)]
Merge branch 'develop' into unify_derivative_views
Cherian Mathew [Mon, 19 Oct 2015 14:02:06 +0000 (16:02 +0200)]
#5301 Add merge call for saving new feature tree
Cherian Mathew [Mon, 19 Oct 2015 13:33:50 +0000 (15:33 +0200)]
#5335 Use new getLanguageByLabel methof in term service
Cherian Mathew [Mon, 19 Oct 2015 12:42:00 +0000 (14:42 +0200)]
#5306 Use default language if preferred language is null
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
Katja Luther [Thu, 15 Oct 2015 09:26:11 +0000 (11:26 +0200)]
fix move taxonnode in natural order
Cherian Mathew [Wed, 14 Oct 2015 08:50:29 +0000 (10:50 +0200)]
#5268 Use convert methods which use uuids
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
Katja Luther [Wed, 14 Oct 2015 08:18:06 +0000 (10:18 +0200)]
fix #5261 and minor
Cherian Mathew [Tue, 13 Oct 2015 15:39:34 +0000 (17:39 +0200)]
Fix setting of key statement
Cherian Mathew [Tue, 13 Oct 2015 12:49:56 +0000 (14:49 +0200)]
Performance tuning
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
Katja Luther [Tue, 13 Oct 2015 10:47:39 +0000 (12:47 +0200)]
fixing #5324 and #5325
Cherian Mathew [Tue, 13 Oct 2015 09:16:11 +0000 (11:16 +0200)]
Bind null session for new derived unit wizard
Cherian Mathew [Mon, 12 Oct 2015 14:46:33 +0000 (16:46 +0200)]
#5321 Add missing return statement for bad credentials
Cherian Mathew [Mon, 12 Oct 2015 14:08:24 +0000 (16:08 +0200)]
#5320 Fix whitespace problem
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.
Katja Luther [Mon, 12 Oct 2015 11:22:06 +0000 (13:22 +0200)]
add distinction between remote and standalone for getting the geoService
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
Katja Luther [Mon, 12 Oct 2015 10:26:58 +0000 (12:26 +0200)]
add moveDescription to transientService
Cherian Mathew [Mon, 12 Oct 2015 08:57:50 +0000 (10:57 +0200)]
Add deproxy of entities in assertSame assertions
Andreas Müller [Fri, 9 Oct 2015 13:42:14 +0000 (15:42 +0200)]
remove Ignore on saveNewTerm test
Andreas Müller [Fri, 9 Oct 2015 13:41:09 +0000 (15:41 +0200)]
Cleanup DeleteOperation
Cherian Mathew [Fri, 9 Oct 2015 13:33:33 +0000 (15:33 +0200)]
Merge branch 'master' into develop
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.
Cherian Mathew [Fri, 9 Oct 2015 12:17:18 +0000 (14:17 +0200)]
Add missing files to ignore on merge conflict
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
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
Cherian Mathew [Thu, 8 Oct 2015 16:18:38 +0000 (18:18 +0200)]
Add test for editor / server cdmlib version check
Cherian Mathew [Wed, 7 Oct 2015 14:43:53 +0000 (16:43 +0200)]
#5302 Add cdm version and services version check
Cherian Mathew [Thu, 8 Oct 2015 14:54:04 +0000 (16:54 +0200)]
Update transient services for new load method
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
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
Katja Luther [Thu, 8 Oct 2015 12:01:46 +0000 (14:01 +0200)]
last changes for #5114
Cherian Mathew [Thu, 8 Oct 2015 10:44:55 +0000 (12:44 +0200)]
Add load capability for MergeResult objects
Cherian Mathew [Thu, 8 Oct 2015 09:12:39 +0000 (11:12 +0200)]
Update root entity merge calls to use new merge method.
Katja Luther [Thu, 8 Oct 2015 10:31:58 +0000 (12:31 +0200)]
minor
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
Katja Luther [Thu, 8 Oct 2015 08:38:05 +0000 (10:38 +0200)]
#5114 fix
Patrick Plitzner [Wed, 7 Oct 2015 15:40:54 +0000 (17:40 +0200)]
Merge branch 'develop' into unify_derivative_views
Patrick Plitzner [Wed, 7 Oct 2015 15:38:48 +0000 (17:38 +0200)]
Implement filter for assigned specimens
- added drop down to select filter type
- implemented filtering of specimen list
Patrick Plitzner [Wed, 7 Oct 2015 15:33:26 +0000 (17:33 +0200)]
Fix label
Patrick Plitzner [Wed, 7 Oct 2015 15:33:17 +0000 (17:33 +0200)]
Listen to taxon selection
Patrick Plitzner [Wed, 7 Oct 2015 15:32:27 +0000 (17:32 +0200)]
Fix potential class cast exception
Patrick Plitzner [Wed, 7 Oct 2015 15:32:02 +0000 (17:32 +0200)]
Fix potential NPE
Patrick Plitzner [Wed, 7 Oct 2015 15:29:59 +0000 (17:29 +0200)]
Use convenience method for associated taxa
Patrick Plitzner [Wed, 7 Oct 2015 11:41:15 +0000 (13:41 +0200)]
Fix typo
Katja Luther [Wed, 7 Oct 2015 12:14:43 +0000 (14:14 +0200)]
new ErrorDialog for delete result messaging
Katja Luther [Wed, 7 Oct 2015 12:13:48 +0000 (14:13 +0200)]
improve messaging for deleteresults
Patrick Plitzner [Wed, 7 Oct 2015 11:16:09 +0000 (13:16 +0200)]
Add initial OccurenceView to RCP plugin
Katja Luther [Wed, 7 Oct 2015 10:34:54 +0000 (12:34 +0200)]
minor
Katja Luther [Wed, 7 Oct 2015 10:31:53 +0000 (12:31 +0200)]
check for isdeletable before set delete button disabled
Patrick Plitzner [Wed, 7 Oct 2015 09:08:04 +0000 (11:08 +0200)]
Fix layout of derivative tree
Patrick Plitzner [Wed, 7 Oct 2015 09:03:46 +0000 (11:03 +0200)]
Delete unused classes
Patrick Plitzner [Wed, 7 Oct 2015 07:20:38 +0000 (09:20 +0200)]
Refresh hierarchy tree after searching
Patrick Plitzner [Wed, 7 Oct 2015 05:24:31 +0000 (07:24 +0200)]
Add "Show View" entry for derivative editor
Patrick Plitzner [Wed, 7 Oct 2015 05:11:13 +0000 (07:11 +0200)]
Move derivative search view classes to taxeditor.editor
- adapted DerivateView
Patrick Plitzner [Tue, 6 Oct 2015 13:50:16 +0000 (15:50 +0200)]
I18n of login and data source view
Patrick Plitzner [Tue, 6 Oct 2015 12:41:54 +0000 (14:41 +0200)]
Fix potential NPE
Patrick Plitzner [Tue, 6 Oct 2015 12:06:34 +0000 (14:06 +0200)]
Fix named area filter for selection dialog (#2353)
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
Katja Luther [Tue, 6 Oct 2015 09:48:42 +0000 (11:48 +0200)]
minor
Katja Luther [Tue, 6 Oct 2015 09:40:05 +0000 (11:40 +0200)]
minor in TaxonNodeDetailElement
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
Katja Luther [Tue, 6 Oct 2015 09:15:05 +0000 (11:15 +0200)]
merge branches
U-BGBM\k.luther [Tue, 6 Oct 2015 09:09:44 +0000 (11:09 +0200)]
merge branches
U-BGBM\k.luther [Tue, 6 Oct 2015 08:47:25 +0000 (10:47 +0200)]
minor
Patrick Plitzner [Tue, 6 Oct 2015 07:21:04 +0000 (09:21 +0200)]
Disable expanding of key section (#3461)
Patrick Plitzner [Mon, 5 Oct 2015 13:55:26 +0000 (15:55 +0200)]
Trim code
U-BGBM\k.luther [Tue, 6 Oct 2015 08:58:00 +0000 (10:58 +0200)]
merge
U-BGBM\k.luther [Tue, 6 Oct 2015 08:47:25 +0000 (10:47 +0200)]
minor
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
Patrick Plitzner [Tue, 6 Oct 2015 07:21:04 +0000 (09:21 +0200)]
Disable expanding of key section (#3461)
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