taxeditor.git
6 years agoMerge branch 'develop' into remoting-4.0
Cherian Mathew [Mon, 24 Aug 2015 09:34:25 +0000 (11:34 +0200)]
Merge branch 'develop' into remoting-4.0

Conflicts:
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/TransientTaxonService.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java

6 years ago#4717 Correct java exec called for macosx
Cherian Mathew [Fri, 21 Aug 2015 08:15:25 +0000 (10:15 +0200)]
#4717 Correct java exec called for macosx

6 years ago#4717 Correct macosx dir structure
Cherian Mathew [Fri, 21 Aug 2015 06:46:06 +0000 (08:46 +0200)]
#4717 Correct macosx dir structure

6 years ago#4717 Correct macosx java path
Cherian Mathew [Thu, 20 Aug 2015 16:59:44 +0000 (18:59 +0200)]
#4717 Correct macosx java path

6 years ago#4717 Correct dir relative path to java exec for mac osx
Cherian Mathew [Thu, 20 Aug 2015 16:27:40 +0000 (18:27 +0200)]
#4717 Correct dir relative path to java exec for mac osx

6 years ago#4717 Correct dir for changing permissions
Cherian Mathew [Thu, 20 Aug 2015 15:52:36 +0000 (17:52 +0200)]
#4717 Correct dir for changing permissions

6 years ago#4717 Add seperate product file for jre bundle
Cherian Mathew [Thu, 20 Aug 2015 15:46:55 +0000 (17:46 +0200)]
#4717 Add seperate product file for jre bundle

6 years agofix for #5114
U-BGBM\k.luther [Thu, 20 Aug 2015 08:37:27 +0000 (10:37 +0200)]
fix for #5114

6 years agofix #5153
U-BGBM\k.luther [Thu, 20 Aug 2015 08:37:27 +0000 (10:37 +0200)]
fix #5153

6 years agoMerge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
U-BGBM\k.luther [Tue, 18 Aug 2015 12:45:59 +0000 (14:45 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

6 years agosmall changes for ideas for better drag and drop in taxonnavigator
U-BGBM\k.luther [Tue, 18 Aug 2015 12:26:04 +0000 (14:26 +0200)]
small changes for ideas for better drag and drop in taxonnavigator

6 years agowhite spaces
U-BGBM\k.luther [Tue, 18 Aug 2015 12:09:17 +0000 (14:09 +0200)]
white spaces

6 years agoCorrect config for molecular plugin
Cherian Mathew [Tue, 18 Aug 2015 11:47:22 +0000 (13:47 +0200)]
Correct config for molecular plugin

6 years agochanges for move descriptions and description elements
U-BGBM\k.luther [Tue, 18 Aug 2015 11:40:45 +0000 (13:40 +0200)]
changes for move descriptions and description elements

6 years agominor
k.luther [Tue, 18 Aug 2015 11:35:40 +0000 (13:35 +0200)]
minor

6 years agoRemove comments
Patrick Plitzner [Tue, 18 Aug 2015 05:51:57 +0000 (07:51 +0200)]
Remove comments

6 years agoRename Derivative View to Derivative Editor
Patrick Plitzner [Mon, 17 Aug 2015 12:56:21 +0000 (14:56 +0200)]
Rename Derivative View to Derivative Editor

6 years agoAdded missing molecular plugin projects
Patrick Plitzner [Mon, 17 Aug 2015 08:38:58 +0000 (10:38 +0200)]
Added missing molecular plugin projects

6 years agowhite space changes
Patrick Plitzner [Mon, 17 Aug 2015 08:19:27 +0000 (10:19 +0200)]
white space changes

6 years agominor
k.luther [Thu, 13 Aug 2015 12:13:04 +0000 (14:13 +0200)]
minor

6 years agominor
k.luther [Thu, 13 Aug 2015 12:12:15 +0000 (14:12 +0200)]
minor

6 years agofix jenkins
k.luther [Thu, 13 Aug 2015 12:09:31 +0000 (14:09 +0200)]
fix jenkins

6 years agofix jenkins
k.luther [Thu, 13 Aug 2015 11:58:56 +0000 (13:58 +0200)]
fix jenkins

6 years agofix #2480
U-BGBM\k.luther [Thu, 13 Aug 2015 11:31:46 +0000 (13:31 +0200)]
fix #2480

6 years agominor
U-BGBM\k.luther [Thu, 13 Aug 2015 11:29:14 +0000 (13:29 +0200)]
minor

6 years agofix delete polytomouskeynode and improve merge in bulk editor
Katja Luther [Thu, 13 Aug 2015 11:20:56 +0000 (13:20 +0200)]
fix delete polytomouskeynode and improve merge in bulk editor

6 years agoRevert last change attic/branches/taxeditor/molecular/25267
Patrick Plitzner [Tue, 11 Aug 2015 08:31:35 +0000 (10:31 +0200)]
Revert last change

6 years agoFix dependencies for LibrALign
Patrick Plitzner [Tue, 11 Aug 2015 07:43:20 +0000 (09:43 +0200)]
Fix dependencies for LibrALign

 - added swt packages to imported packages

6 years agoDepenedency management
Patrick Plitzner [Tue, 11 Aug 2015 06:41:29 +0000 (08:41 +0200)]
Depenedency management
 - added javax.swing and org.eclipse swt to dependencies

6 years agoRemove unused folder
Patrick Plitzner [Tue, 11 Aug 2015 05:02:42 +0000 (07:02 +0200)]
Remove unused folder

6 years ago#5139 Add refresh of classification when new taxon is direct child or root node
Cherian Mathew [Fri, 7 Aug 2015 14:10:38 +0000 (16:10 +0200)]
#5139 Add refresh of classification when new taxon is direct child or root node

6 years ago#5134, #5136 (and potentially #5135) Fix incorrect clean up of session manager and...
Cherian Mathew [Fri, 7 Aug 2015 12:11:26 +0000 (14:11 +0200)]
#5134, #5136 (and potentially #5135) Fix incorrect clean up of session manager and Check for class in new taxon wizard

6 years ago#5130 Extend import wizards to import data via remoting and Add tests for the same
Cherian Mathew [Thu, 6 Aug 2015 14:01:13 +0000 (16:01 +0200)]
#5130 Extend import wizards to import data via remoting and Add tests for the same

6 years ago#5129 Extend export ui for remoting
Cherian Mathew [Tue, 4 Aug 2015 16:34:22 +0000 (18:34 +0200)]
#5129 Extend export ui for remoting

6 years ago#5029 Add dev remote source quick connect
Cherian Mathew [Tue, 4 Aug 2015 16:10:56 +0000 (18:10 +0200)]
#5029 Add dev remote source quick connect

6 years ago#5123, #5124 Make ChecklistEditor remoting session aware and fix performance issue...
Cherian Mathew [Thu, 30 Jul 2015 14:58:36 +0000 (16:58 +0200)]
#5123, #5124 Make ChecklistEditor remoting session aware and fix performance issue with available distribution pereference page

6 years ago#5122 Implement Null Entity Session and integrate it in required preference pages
Cherian Mathew [Thu, 30 Jul 2015 13:06:52 +0000 (15:06 +0200)]
#5122 Implement Null Entity Session and integrate it in required preference pages

6 years ago#5209 Implement auto selection of last successfully connected server / instance
Cherian Mathew [Thu, 30 Jul 2015 10:55:10 +0000 (12:55 +0200)]
#5209 Implement auto selection of last successfully connected server / instance

6 years ago#5029 Add login info to application title bar
Cherian Mathew [Thu, 30 Jul 2015 10:47:29 +0000 (12:47 +0200)]
#5029 Add login info to application title bar

6 years ago#5029 Add functionality for login to remember credentials, reconnect and switch user
Cherian Mathew [Thu, 30 Jul 2015 08:58:19 +0000 (10:58 +0200)]
#5029 Add functionality for login to remember credentials, reconnect and switch user

6 years agoCorrect test method call
Cherian Mathew [Tue, 28 Jul 2015 13:47:06 +0000 (15:47 +0200)]
Correct test method call

6 years ago#5209 Add version ui elements to advanced view, Make port text field editable for...
Cherian Mathew [Tue, 28 Jul 2015 13:33:54 +0000 (15:33 +0200)]
#5209 Add version ui elements to advanced view, Make port text field editable for localhost servers

6 years ago#5029 Implement oneclick login for remoting
Cherian Mathew [Tue, 28 Jul 2015 12:15:19 +0000 (14:15 +0200)]
#5029 Implement oneclick login for remoting

6 years agoFix URI Syntax error for new serialised model map
Cherian Mathew [Fri, 24 Jul 2015 13:33:51 +0000 (15:33 +0200)]
Fix URI Syntax error for new serialised model map

6 years agoFix compile error in FeaturDistributionDetailElement
Andreas Müller [Fri, 24 Jul 2015 13:25:46 +0000 (15:25 +0200)]
Fix compile error in FeaturDistributionDetailElement

6 years agoFix compile error in FeaturDistributionDetailElement
Andreas Müller [Fri, 24 Jul 2015 13:25:46 +0000 (15:25 +0200)]
Fix compile error in FeaturDistributionDetailElement

6 years ago#5061 Add force refresh of p2 repositories before checking for updates
Cherian Mathew [Wed, 22 Jul 2015 14:23:41 +0000 (16:23 +0200)]
#5061 Add force refresh of p2 repositories before checking for updates

6 years agoAdd access to service cacher
Cherian Mathew [Thu, 23 Jul 2015 12:45:11 +0000 (14:45 +0200)]
Add access to service cacher

6 years agoCorrect serialised cdm map location
Cherian Mathew [Thu, 23 Jul 2015 12:09:21 +0000 (14:09 +0200)]
Correct serialised cdm map location

6 years ago#4932 Remove autowired members, Use serliaised cdm model map
Cherian Mathew [Thu, 23 Jul 2015 11:54:34 +0000 (13:54 +0200)]
#4932 Remove autowired members, Use serliaised cdm model map

6 years ago#5061 Add force refresh of p2 repositories before checking for updates
Cherian Mathew [Wed, 22 Jul 2015 14:23:41 +0000 (16:23 +0200)]
#5061 Add force refresh of p2 repositories before checking for updates

6 years agoFix Polytomous Key duplicate entry issue
Cherian Mathew [Wed, 22 Jul 2015 13:10:09 +0000 (15:10 +0200)]
Fix Polytomous Key duplicate entry issue

6 years agoRename aggregator to lib
Patrick Plitzner [Wed, 22 Jul 2015 09:44:55 +0000 (11:44 +0200)]
Rename aggregator to lib

6 years agoAdd lib folder to dependency plugin
Patrick Plitzner [Wed, 22 Jul 2015 09:13:06 +0000 (11:13 +0200)]
Add lib folder to dependency plugin

6 years agoAdd missing properties file
Cherian Mathew [Wed, 22 Jul 2015 08:45:00 +0000 (10:45 +0200)]
Add missing properties file

6 years agoIntegrate molecular plugins
Cherian Mathew [Wed, 22 Jul 2015 08:27:46 +0000 (10:27 +0200)]
Integrate molecular plugins

6 years agoAdd remoting operation / handlers for key list editor
Cherian Mathew [Wed, 22 Jul 2015 07:39:09 +0000 (09:39 +0200)]
Add remoting operation / handlers for key list editor

6 years agoNew operation abstract class for merge
Cherian Mathew [Tue, 21 Jul 2015 13:34:55 +0000 (15:34 +0200)]
New operation abstract class for merge

6 years agoRevert change for proxy since it breaks the name editor
Cherian Mathew [Tue, 21 Jul 2015 11:52:01 +0000 (13:52 +0200)]
Revert change for proxy since it breaks the name editor

6 years agoMerge branch 'LibrAlign' into develop
Patrick Plitzner [Tue, 21 Jul 2015 11:33:31 +0000 (13:33 +0200)]
Merge branch 'LibrAlign' into develop

6 years agoSet security context for tests
Cherian Mathew [Tue, 21 Jul 2015 11:10:41 +0000 (13:10 +0200)]
Set security context for tests

6 years agoRemove duplicate webapp war
Cherian Mathew [Tue, 21 Jul 2015 10:45:34 +0000 (12:45 +0200)]
Remove duplicate webapp war

6 years agoEnhance handling of simple and advanced media view attic/branches/taxeditor/LibrAlign/25169
Patrick Plitzner [Mon, 20 Jul 2015 18:16:59 +0000 (20:16 +0200)]
Enhance handling of simple and advanced media view

 - Buffer URI string in case of parsing errors
 - disable toggling when media conists of more than one representation
or part

6 years agoChange color when error occurs
Patrick Plitzner [Mon, 20 Jul 2015 16:34:06 +0000 (18:34 +0200)]
Change color when error occurs

6 years agoDisable Termeditor menu if CdmStore is disconnected
Patrick Plitzner [Tue, 21 Jul 2015 08:54:16 +0000 (10:54 +0200)]
Disable Termeditor menu if CdmStore is disconnected

6 years agoAdd missing null check
Patrick Plitzner [Tue, 21 Jul 2015 06:55:52 +0000 (08:55 +0200)]
Add missing null check

6 years agoRemove cdmViewer extension usage
Patrick Plitzner [Tue, 21 Jul 2015 06:55:27 +0000 (08:55 +0200)]
Remove cdmViewer extension usage

6 years agoAdd @Override
Patrick Plitzner [Tue, 21 Jul 2015 06:54:31 +0000 (08:54 +0200)]
Add @Override

6 years agoSet Visibility according to CdmStore connection
Patrick Plitzner [Tue, 21 Jul 2015 06:54:17 +0000 (08:54 +0200)]
Set Visibility according to CdmStore connection

6 years agoGeneralize cdmViewer extension point
Patrick Plitzner [Mon, 20 Jul 2015 16:31:02 +0000 (18:31 +0200)]
Generalize cdmViewer extension point

Refactored parameters to be based on commands.

6 years agoFixed NPE when saving an alignment with a read without attached pherogram.
b.stoever [Tue, 21 Jul 2015 10:25:51 +0000 (10:25 +0000)]
Fixed NPE when saving an alignment with a read without attached pherogram.

6 years ago#5098 : Fix issue with authentication when using search bar
Cherian Mathew [Tue, 21 Jul 2015 10:06:29 +0000 (12:06 +0200)]
#5098 : Fix issue with authentication when using search bar

6 years agoEnhance handling of simple and advanced media view
Patrick Plitzner [Mon, 20 Jul 2015 18:16:59 +0000 (20:16 +0200)]
Enhance handling of simple and advanced media view

 - Buffer URI string in case of parsing errors
 - disable toggling when media conists of more than one representation
or part

6 years agoChange color when error occurs
Patrick Plitzner [Mon, 20 Jul 2015 16:34:06 +0000 (18:34 +0200)]
Change color when error occurs

6 years agoDisable Termeditor menu if CdmStore is disconnected
Patrick Plitzner [Tue, 21 Jul 2015 08:54:16 +0000 (10:54 +0200)]
Disable Termeditor menu if CdmStore is disconnected

6 years agoAdd missing null check
Patrick Plitzner [Tue, 21 Jul 2015 06:55:52 +0000 (08:55 +0200)]
Add missing null check

6 years agoRemove cdmViewer extension usage
Patrick Plitzner [Tue, 21 Jul 2015 06:55:27 +0000 (08:55 +0200)]
Remove cdmViewer extension usage

6 years agoAdd @Override
Patrick Plitzner [Tue, 21 Jul 2015 06:54:31 +0000 (08:54 +0200)]
Add @Override

6 years agoSet Visibility according to CdmStore connection
Patrick Plitzner [Tue, 21 Jul 2015 06:54:17 +0000 (08:54 +0200)]
Set Visibility according to CdmStore connection

6 years agoGeneralize cdmViewer extension point
Patrick Plitzner [Mon, 20 Jul 2015 16:31:02 +0000 (18:31 +0200)]
Generalize cdmViewer extension point

Refactored parameters to be based on commands.

6 years agoCorrect tests to account for change in cache loader mechanism
Cherian Mathew [Tue, 21 Jul 2015 08:42:01 +0000 (10:42 +0200)]
Correct tests to account for change in cache loader mechanism

6 years agoFix duplicate entity issue with newly created cdm entities
Cherian Mathew [Mon, 20 Jul 2015 17:04:05 +0000 (19:04 +0200)]
Fix duplicate entity issue with newly created cdm entities

6 years agoUse new find method with update
Cherian Mathew [Mon, 20 Jul 2015 13:37:23 +0000 (15:37 +0200)]
Use new find method with update

6 years agomerge-update from trunk
Patric Plitzner [Mon, 20 Jul 2015 11:18:00 +0000 (11:18 +0000)]
merge-update from trunk

6 years agoAdd unimplemented methods to transient service
Cherian Mathew [Mon, 20 Jul 2015 09:50:24 +0000 (11:50 +0200)]
Add unimplemented methods to transient service

6 years agoUpdated version due to trunk merge
Patric Plitzner [Mon, 20 Jul 2015 09:14:11 +0000 (09:14 +0000)]
Updated version due to trunk merge

6 years agoCorrect issues from last merge
Cherian Mathew [Mon, 20 Jul 2015 09:00:39 +0000 (11:00 +0200)]
Correct issues from last merge

6 years agomerge-update from trunk
Patric Plitzner [Mon, 20 Jul 2015 08:57:42 +0000 (08:57 +0000)]
merge-update from trunk

6 years agoUpdate transient service to be compatible with cdmlib service
Cherian Mathew [Fri, 17 Jul 2015 16:11:28 +0000 (18:11 +0200)]
Update transient service to be compatible with cdmlib service

6 years agoMerge branch 'develop' into remoting-4.0
Cherian Mathew [Fri, 17 Jul 2015 16:07:58 +0000 (18:07 +0200)]
Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
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
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java

6 years ago#5010 : Initial commit to fix duplicate entry issue when creating new key node
Cherian Mathew [Fri, 17 Jul 2015 13:05:35 +0000 (15:05 +0200)]
#5010 : Initial commit to fix duplicate entry issue when creating new key node

6 years agoUpdated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and...
jenkins [Fri, 17 Jul 2015 10:07:54 +0000 (12:07 +0200)]
Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

6 years agoUpdating develop poms back to pre merge state
jenkins [Fri, 17 Jul 2015 10:06:40 +0000 (12:06 +0200)]
Updating develop poms back to pre merge state

6 years agoMerge branch 'master' into develop
jenkins [Fri, 17 Jul 2015 10:06:40 +0000 (12:06 +0200)]
Merge branch 'master' into develop

6 years agoupdating develop poms to master versions to avoid merge conflicts
jenkins [Fri, 17 Jul 2015 10:06:40 +0000 (12:06 +0200)]
updating develop poms to master versions to avoid merge conflicts

6 years agoMerge branch 'release/3.7.0' root/tags/taxeditor/3.7.0 3.7.0
jenkins [Fri, 17 Jul 2015 10:06:37 +0000 (12:06 +0200)]
Merge branch 'release/3.7.0'

6 years agoupdating poms for branch'release/3.7.0' with non-snapshot versions
jenkins [Fri, 17 Jul 2015 10:03:39 +0000 (12:03 +0200)]
updating poms for branch'release/3.7.0' with non-snapshot versions

6 years agoRevert project versions to 3.7.0-SNAPSHOT
jenkins [Fri, 17 Jul 2015 10:02:39 +0000 (12:02 +0200)]
Revert project versions to 3.7.0-SNAPSHOT

6 years agoUpdated version in pom / project files to taxeditor version : 3.7.0 and cdmlib versio...
jenkins [Fri, 17 Jul 2015 10:01:36 +0000 (12:01 +0200)]
Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0

6 years agoCorrect for develop reset
jenkins [Fri, 17 Jul 2015 10:00:11 +0000 (12:00 +0200)]
Correct for develop reset