taxeditor.git
6 years agobumping eu.etaxonomy.taxeditor.test to version 4.0.0-SNAPSHOT
Andreas Kohlbecker [Wed, 9 Mar 2016 14:07:33 +0000 (15:07 +0100)]
bumping eu.etaxonomy.taxeditor.test to version 4.0.0-SNAPSHOT

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Wed, 9 Mar 2016 11:07:29 +0000 (12:07 +0100)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years agofix #5626
Katja Luther [Wed, 9 Mar 2016 11:06:29 +0000 (12:06 +0100)]
fix #5626

6 years agodowngrading maven jetty plugin java 7 compatibel version
Andreas Kohlbecker [Tue, 8 Mar 2016 14:58:46 +0000 (15:58 +0100)]
downgrading maven jetty plugin java 7 compatibel version

6 years agocleaning up test resources
Andreas Kohlbecker [Tue, 8 Mar 2016 14:53:12 +0000 (15:53 +0100)]
cleaning up test resources

6 years agoadding missing dependecies to maven jetty plugin - cdm-server now starts without...
Andreas Kohlbecker [Tue, 8 Mar 2016 14:27:22 +0000 (15:27 +0100)]
adding missing dependecies to maven jetty plugin - cdm-server now starts without errors

6 years agoworkaround for maven bug MNG-5522
Andreas Kohlbecker [Tue, 8 Mar 2016 14:09:40 +0000 (15:09 +0100)]
workaround for maven bug MNG-5522

6 years agofix move synonym to another taxon
Katja Luther [Thu, 3 Mar 2016 13:53:46 +0000 (14:53 +0100)]
fix move synonym to another taxon

6 years agoUpdated version in pom / project files to taxeditor version : 4.0.0-SNAPSHOT and...
Andreas Kohlbecker [Wed, 2 Mar 2016 13:12:36 +0000 (14:12 +0100)]
Updated version in pom / project files to taxeditor version : 4.0.0-SNAPSHOT and cdmlib version : 4.0.0-SNAPSHOT

6 years agomerge of origin develop
Patrick Plitzner [Mon, 29 Feb 2016 13:50:33 +0000 (14:50 +0100)]
merge of origin develop

6 years agoAdd ReferencingObjects view to "Show View" menu
Patrick Plitzner [Mon, 29 Feb 2016 13:39:45 +0000 (14:39 +0100)]
Add ReferencingObjects view to "Show View" menu

6 years agomake restore of taxon navigator a preference
Katja Luther [Mon, 29 Feb 2016 13:31:01 +0000 (14:31 +0100)]
make restore of taxon navigator a preference

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Mon, 29 Feb 2016 12:43:59 +0000 (13:43 +0100)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years agofix #5289
k.luther [Mon, 29 Feb 2016 12:10:03 +0000 (13:10 +0100)]
fix #5289

6 years agoFix label #4731
Patrick Plitzner [Mon, 29 Feb 2016 11:49:09 +0000 (12:49 +0100)]
Fix label #4731

6 years agosmaller changes to fix moving of taxonnodes
Katja Luther [Fri, 26 Feb 2016 10:18:40 +0000 (11:18 +0100)]
smaller changes to fix moving of taxonnodes

6 years agoRemove unused dependencies from MANIFEST.MF #5530
Patrick Plitzner [Wed, 24 Feb 2016 08:53:29 +0000 (09:53 +0100)]
Remove unused dependencies from MANIFEST.MF #5530

6 years agoMade referenced entities selectabel for supplemental data #4627
Patrick Plitzner [Wed, 24 Feb 2016 07:01:43 +0000 (08:01 +0100)]
Made referenced entities selectabel for supplemental data #4627

6 years agoFix editing of transient entities in EntitySelectionElement #5592
Patrick Plitzner [Tue, 23 Feb 2016 17:25:31 +0000 (18:25 +0100)]
Fix editing of transient entities in EntitySelectionElement #5592

6 years agoFix potential NPE #5565
Patrick Plitzner [Tue, 23 Feb 2016 16:55:35 +0000 (17:55 +0100)]
Fix potential NPE #5565

6 years agoTrim code
p.plitzner [Tue, 23 Feb 2016 08:22:08 +0000 (09:22 +0100)]
Trim code

6 years agoHandle "Finish" button correctly for import wizards
p.plitzner [Tue, 23 Feb 2016 08:20:13 +0000 (09:20 +0100)]
Handle "Finish" button correctly for import wizards
 - "Finish" is only enabled when a file is selected #5589

6 years agoRemove kindOfUnit from label in DerivativeEditor
p.plitzner [Tue, 23 Feb 2016 08:08:22 +0000 (09:08 +0100)]
Remove kindOfUnit from label in DerivativeEditor

6 years agoREvert caching of cdm formatter
p.plitzner [Tue, 23 Feb 2016 07:58:20 +0000 (08:58 +0100)]
REvert caching of cdm formatter

6 years agoEnhance error message for media details view #5587
p.plitzner [Tue, 23 Feb 2016 07:50:57 +0000 (08:50 +0100)]
Enhance error message for media details view #5587

6 years agoFix potential NPE #5511
p.plitzner [Mon, 22 Feb 2016 17:16:46 +0000 (18:16 +0100)]
Fix potential NPE #5511

6 years agoChange browse icon #5196
p.plitzner [Mon, 22 Feb 2016 17:14:16 +0000 (18:14 +0100)]
Change browse icon #5196

6 years agoCache cdm formatter in DerivateLabelProvider
p.plitzner [Mon, 22 Feb 2016 17:07:54 +0000 (18:07 +0100)]
Cache cdm formatter in DerivateLabelProvider

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Tue, 23 Feb 2016 10:39:45 +0000 (11:39 +0100)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years agominor
k.luther [Tue, 23 Feb 2016 10:18:17 +0000 (11:18 +0100)]
minor

6 years agochanges for #5346
k.luther [Tue, 23 Feb 2016 10:17:26 +0000 (11:17 +0100)]
changes for #5346

6 years agoFix potential infinite loop for selection change events
Patrick Plitzner [Mon, 22 Feb 2016 15:53:44 +0000 (16:53 +0100)]
Fix potential infinite loop for selection change events

6 years agoAdapt to cdmlib formatter interface change
p.plitzner [Mon, 22 Feb 2016 15:23:24 +0000 (16:23 +0100)]
Adapt to cdmlib formatter interface change

6 years agoFix field unit filter for bulk editor #5572
Patrick Plitzner [Mon, 22 Feb 2016 14:30:35 +0000 (15:30 +0100)]
Fix field unit filter for bulk editor #5572

6 years agoadding datasources to maven-jetty-plugin as dependency
Andreas Kohlbecker [Fri, 19 Feb 2016 15:09:29 +0000 (16:09 +0100)]
adding datasources to maven-jetty-plugin as dependency

6 years agoadding c3p0-0.9.5.2.jar to MANIFEST.MF instead of pom.xml dependency
Andreas Kohlbecker [Thu, 18 Feb 2016 11:57:13 +0000 (12:57 +0100)]
adding c3p0-0.9.5.2.jar to MANIFEST.MF instead of pom.xml dependency

6 years agoadding c3p0-0.9.5.2.jar to MANIFEST.MF instead of pom.xml dependency
Andreas Kohlbecker [Thu, 18 Feb 2016 11:56:57 +0000 (12:56 +0100)]
adding c3p0-0.9.5.2.jar to MANIFEST.MF instead of pom.xml dependency

6 years agoproviding the datasource dependencies to jetty which are excluded from the cdmlib...
Andreas Kohlbecker [Thu, 18 Feb 2016 11:17:35 +0000 (12:17 +0100)]
providing the datasource dependencies to jetty which are excluded from the cdmlib-remote-webapp.war

6 years agofix #5574
Katja Luther [Thu, 18 Feb 2016 10:10:08 +0000 (11:10 +0100)]
fix #5574

6 years agoRemove CdmViewerChooser from double-click functionality of taxon
p.plitzner [Wed, 17 Feb 2016 17:07:37 +0000 (18:07 +0100)]
Remove CdmViewerChooser from double-click functionality of taxon
navigator

6 years agoFix type check in CdmViewerChooser
p.plitzner [Wed, 17 Feb 2016 17:06:53 +0000 (18:06 +0100)]
Fix type check in CdmViewerChooser

6 years agoFix handler for opening derivative editor from taxon navigator
p.plitzner [Wed, 17 Feb 2016 08:49:18 +0000 (09:49 +0100)]
Fix handler for opening derivative editor from taxon navigator

6 years agoAdd newer itextpdf dependency to avoid conflict with itextpdf 5.0.2 from
pplitzner [Tue, 16 Feb 2016 14:35:59 +0000 (15:35 +0100)]
Add newer itextpdf dependency to avoid conflict with itextpdf 5.0.2 from
identificationAPI 1.0

6 years agoFix build properties and classpath
pplitzner [Tue, 16 Feb 2016 14:34:44 +0000 (15:34 +0100)]
Fix build properties and classpath

6 years agoMade molecular plugin optional
pplitzner [Tue, 16 Feb 2016 14:34:25 +0000 (15:34 +0100)]
Made molecular plugin optional

6 years agoSet hasMoreMembers flag correctly
Patrick Plitzner [Tue, 16 Feb 2016 15:21:38 +0000 (16:21 +0100)]
Set hasMoreMembers flag correctly

6 years agoAdd menu option to open specimens from navigator
Patrick Plitzner [Tue, 9 Feb 2016 06:37:57 +0000 (07:37 +0100)]
Add menu option to open specimens from navigator

6 years agoExtend factual data view context menu with option to open specimen directly in Deriva...
Patrick Plitzner [Mon, 8 Feb 2016 17:05:18 +0000 (18:05 +0100)]
Extend factual data view context menu with option to open specimen directly in DerivativeEditor

6 years agoAdd possibility to specifiy multiple uuids as command parameters
Patrick Plitzner [Mon, 8 Feb 2016 17:02:20 +0000 (18:02 +0100)]
Add possibility to specifiy multiple uuids as command parameters

6 years agoAdd possibility to open Derivative Editor for specified specimen uuids
Patrick Plitzner [Mon, 8 Feb 2016 17:00:59 +0000 (18:00 +0100)]
Add possibility to open Derivative Editor for specified specimen uuids

6 years agoFix error message
Patrick Plitzner [Mon, 8 Feb 2016 16:59:23 +0000 (17:59 +0100)]
Fix error message

6 years agoAdd FIXME comment
Patrick Plitzner [Wed, 3 Feb 2016 16:59:49 +0000 (17:59 +0100)]
Add FIXME comment

6 years agoAdjust specimen delete configurator popup
Patrick Plitzner [Tue, 16 Feb 2016 14:02:59 +0000 (15:02 +0100)]
Adjust specimen delete configurator popup
 - remove molecular flag
 - fix text for description flag

6 years agoDisable "Described Specimen" section in DetailsView #5559
Patrick Plitzner [Mon, 15 Feb 2016 14:07:25 +0000 (15:07 +0100)]
Disable "Described Specimen" section in DetailsView #5559

6 years agoResolve merge conflict
Patrick Plitzner [Mon, 15 Feb 2016 10:44:32 +0000 (11:44 +0100)]
Resolve merge conflict

6 years agoFix label
Patrick Plitzner [Tue, 9 Feb 2016 13:05:24 +0000 (14:05 +0100)]
Fix label

6 years agoMerge branch 'hotfix/3.12.4' into develop
jenkins [Mon, 15 Feb 2016 09:31:03 +0000 (10:31 +0100)]
Merge branch 'hotfix/3.12.4' into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java - resolved
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java - UNRESOLVED!!!!!

6 years ago#5533 writing and reading cdmserver configuration from and to JSON file
Andreas Kohlbecker [Thu, 11 Feb 2016 10:26:50 +0000 (11:26 +0100)]
#5533 writing and reading cdmserver configuration from and to JSON file

6 years agoclasspath updates
Andreas Kohlbecker [Wed, 10 Feb 2016 14:16:10 +0000 (15:16 +0100)]
classpath updates

6 years ago#5533 reading/writing remote server config from/to json
Andreas Kohlbecker [Fri, 5 Feb 2016 16:34:50 +0000 (17:34 +0100)]
#5533 reading/writing remote server config from/to json

6 years agoUpdated version in pom / project files to taxeditor version : 3.12.4 and cdmlib versi...
jenkins [Thu, 11 Feb 2016 10:04:13 +0000 (11:04 +0100)]
Updated version in pom / project files to taxeditor version : 3.12.4 and cdmlib version : 3.12.4

6 years agofix the merge conflicts of hotfix branch
Katja Luther [Wed, 10 Feb 2016 16:03:23 +0000 (17:03 +0100)]
fix the merge conflicts of hotfix branch

6 years agoMerge branch 'hotfix/3.12.3' root/tags/taxeditor/3.12.3 3.12.3
jenkins [Wed, 10 Feb 2016 15:11:46 +0000 (16:11 +0100)]
Merge branch 'hotfix/3.12.3'

6 years agofix entity already associated with another entity bug
Katja Luther [Wed, 10 Feb 2016 15:03:47 +0000 (16:03 +0100)]
fix entity already associated with another entity bug

6 years agoUpdated version in pom / project files to taxeditor version : 3.12.3 and cdmlib versi...
Andreas Kohlbecker [Wed, 10 Feb 2016 14:58:43 +0000 (15:58 +0100)]
Updated version in pom / project files to taxeditor version : 3.12.3 and cdmlib version : 3.12.3

6 years agoDisable (unstable) Specimen ABCD/BioCASE import
Patrick Plitzner [Tue, 9 Feb 2016 10:35:31 +0000 (11:35 +0100)]
Disable (unstable) Specimen ABCD/BioCASE import

6 years agoPopup message before editing an unpersisted object #5489
Patrick Plitzner [Tue, 9 Feb 2016 09:51:31 +0000 (10:51 +0100)]
Popup message before editing an unpersisted object #5489

6 years agoFix NPE when adding new taxon to classification
Patrick Plitzner [Mon, 8 Feb 2016 13:08:36 +0000 (14:08 +0100)]
Fix NPE when adding new taxon to classification

6 years agocreate a message dialog if a widget is disposed problem occurs
k.luther [Fri, 5 Feb 2016 15:07:37 +0000 (16:07 +0100)]
create a message dialog if a widget is disposed problem occurs

6 years agoavoid widget is disposed exceptions
k.luther [Fri, 5 Feb 2016 14:47:23 +0000 (15:47 +0100)]
avoid widget is disposed exceptions

6 years agorevert the commit, which is already in hotfix branch
Katja Luther [Thu, 4 Feb 2016 14:07:11 +0000 (15:07 +0100)]
revert the commit, which is already in hotfix branch

6 years agomissed to commit the changed plugin.xml
k.luther [Thu, 4 Feb 2016 13:40:50 +0000 (14:40 +0100)]
missed to commit the changed plugin.xml

6 years agominor
k.luther [Thu, 4 Feb 2016 13:40:02 +0000 (14:40 +0100)]
minor

6 years agofixes
Katja Luther [Thu, 4 Feb 2016 13:36:41 +0000 (14:36 +0100)]
fixes

6 years agoMerge branch 'hotfix/3.12.3' of https://dev.e-taxonomy.eu/git/taxeditor into hotfix...
Katja Luther [Thu, 4 Feb 2016 12:53:35 +0000 (13:53 +0100)]
Merge branch 'hotfix/3.12.3' of https://dev.e-taxonomy.eu/git/taxeditor into hotfix/3.12.3

6 years agodo not provide menu item change synonym to accepted taxon for homotyp. synonym of...
Katja Luther [Thu, 4 Feb 2016 12:45:09 +0000 (13:45 +0100)]
do not provide menu item change synonym to accepted taxon for homotyp. synonym of accepted taxon and fix new taxonNode creation

6 years agocherry pick from develop
k.luther [Thu, 4 Feb 2016 12:00:44 +0000 (13:00 +0100)]
cherry pick from develop

6 years agoadding demoserver 2 to select list in connect dialog
Andreas Kohlbecker [Thu, 4 Feb 2016 11:59:31 +0000 (12:59 +0100)]
adding demoserver 2 to select list in connect dialog

6 years agoUpgrade lucene version in TaxEditor
Andreas Müller [Wed, 3 Feb 2016 15:18:33 +0000 (16:18 +0100)]
Upgrade lucene version in TaxEditor

6 years agoAdd SNAPSHOT to cdmlib dependencies
Patrick Plitzner [Wed, 3 Feb 2016 14:33:05 +0000 (15:33 +0100)]
Add SNAPSHOT to cdmlib dependencies

6 years agoadd the sec reference of the parent to the new created taxon node
k.luther [Wed, 3 Feb 2016 09:49:35 +0000 (10:49 +0100)]
add the sec reference of the parent to the new created taxon node

6 years agoUpdated version in pom / project files to taxeditor version : 3.12.3 and cdmlib versi...
jenkins [Wed, 3 Feb 2016 13:56:59 +0000 (14:56 +0100)]
Updated version in pom / project files to taxeditor version : 3.12.3 and cdmlib version : 3.12.3

6 years agoRemove spring security remoting jar
Patrick Plitzner [Wed, 3 Feb 2016 13:47:21 +0000 (14:47 +0100)]
Remove spring security remoting jar

6 years agoPre-select derivatives according to filter criteria - also used service method to...
Patrick Plitzner [Wed, 3 Feb 2016 06:50:07 +0000 (07:50 +0100)]
Pre-select derivatives according to filter criteria - also used service method to filter specimens

6 years agoAdd parameter to set max specimen count before warning
Patrick Plitzner [Wed, 3 Feb 2016 06:48:55 +0000 (07:48 +0100)]
Add parameter to set max specimen count before warning

6 years agoRefactor DerivativeEditor context menu
Patrick Plitzner [Mon, 1 Feb 2016 07:52:37 +0000 (08:52 +0100)]
Refactor DerivativeEditor context menu

 - extracted "link with taxon selection" to plugin.xml

6 years agouse new createTaxonNode method instead of do it on the editor side
Katja Luther [Tue, 2 Feb 2016 12:57:47 +0000 (13:57 +0100)]
use new createTaxonNode method instead of do it on the editor side

6 years agofix tests
Katja Luther [Mon, 1 Feb 2016 08:23:05 +0000 (09:23 +0100)]
fix tests

6 years agoChange only for debugging
Andreas Müller [Thu, 21 Jan 2016 15:33:37 +0000 (16:33 +0100)]
Change only for debugging

6 years agoCleanup a bit, no real change
Andreas Müller [Thu, 21 Jan 2016 15:23:31 +0000 (16:23 +0100)]
Cleanup a bit, no real change

6 years agotypo
Andreas Kohlbecker [Thu, 21 Jan 2016 14:26:36 +0000 (15:26 +0100)]
typo

6 years agoupdating serialVersionUID and documentation
Andreas Kohlbecker [Thu, 21 Jan 2016 13:56:57 +0000 (14:56 +0100)]
updating serialVersionUID and documentation

6 years agoRevert "setting user.home for jetty-plugin, lucene index should be in target folder...
Andreas Kohlbecker [Thu, 21 Jan 2016 09:36:32 +0000 (10:36 +0100)]
Revert "setting user.home for jetty-plugin, lucene index should be in target folder second try"

This reverts commit fe209d5ebb5fbc04d770729a438087819d6ef4ac.

6 years agosetting user.home for jetty-plugin, lucene index should be in target folder second try
Andreas Kohlbecker [Thu, 21 Jan 2016 09:29:14 +0000 (10:29 +0100)]
setting user.home for jetty-plugin, lucene index should be in target folder second try

6 years agosetting user.home for jetty-plugin, lucene index should be in target folder
Andreas Kohlbecker [Thu, 21 Jan 2016 07:50:57 +0000 (08:50 +0100)]
setting user.home for jetty-plugin, lucene index should be in target folder

6 years agoUpdate taxeditor-test manifest version to 3.13
Andreas Müller [Wed, 20 Jan 2016 22:35:05 +0000 (23:35 +0100)]
Update taxeditor-test manifest version to 3.13

6 years agoUpdate taxeditor-test version to 3.13
Andreas Müller [Wed, 20 Jan 2016 22:25:23 +0000 (23:25 +0100)]
Update taxeditor-test version to 3.13

6 years agoAdd spring-security-remoting jar
Patrick Plitzner [Wed, 20 Jan 2016 16:42:59 +0000 (17:42 +0100)]
Add spring-security-remoting jar

6 years agoUpdate build.properties
Patrick Plitzner [Wed, 20 Jan 2016 16:35:07 +0000 (17:35 +0100)]
Update build.properties

6 years agoUpdate dependencies
Patrick Plitzner [Wed, 20 Jan 2016 16:23:41 +0000 (17:23 +0100)]
Update dependencies