Cherian Mathew [Wed, 26 Aug 2015 09:03:14 +0000 (11:03 +0200)]
Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
Cherian Mathew [Tue, 25 Aug 2015 11:09:07 +0000 (13:09 +0200)]
#5160 Use new merge method with ids as arguments
Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
Cherian Mathew [Tue, 25 Aug 2015 11:09:07 +0000 (13:09 +0200)]
#5160 Use new merge method with ids as arguments
Patrick Plitzner [Tue, 25 Aug 2015 08:21:25 +0000 (10:21 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
U-BGBM\k.luther [Tue, 25 Aug 2015 07:50:28 +0000 (09:50 +0200)]
fix #5153
U-BGBM\k.luther [Tue, 25 Aug 2015 07:50:28 +0000 (09:50 +0200)]
fix #5153
Patrick Plitzner [Tue, 25 Aug 2015 06:36:27 +0000 (08:36 +0200)]
Externalize Strings
Patrick Plitzner [Tue, 25 Aug 2015 06:22:23 +0000 (08:22 +0200)]
Merge develop into branch
Patrick Plitzner [Tue, 25 Aug 2015 06:15:20 +0000 (08:15 +0200)]
Change order of controls
Patrick Plitzner [Tue, 25 Aug 2015 06:06:59 +0000 (08:06 +0200)]
Use web icon for URL button
Patrick Plitzner [Tue, 25 Aug 2015 06:06:12 +0000 (08:06 +0200)]
Create constant for default column number in detail sections
Patrick Plitzner [Tue, 25 Aug 2015 06:05:51 +0000 (08:05 +0200)]
Split up control creation of TextWithLabelElement
- this fixes layout problems when inserting a separate button for
opening links
Patrick Plitzner [Mon, 24 Aug 2015 17:44:19 +0000 (19:44 +0200)]
Trim code
Patrick Plitzner [Mon, 24 Aug 2015 17:43:49 +0000 (19:43 +0200)]
Remove equal width from columns
Cherian Mathew [Mon, 24 Aug 2015 15:17:55 +0000 (17:17 +0200)]
Correct properties file load and server info test
Cherian Mathew [Mon, 24 Aug 2015 12:33:09 +0000 (14:33 +0200)]
Add entity type to CdmChangeEvent and fixes #5139
Patrick Plitzner [Mon, 24 Aug 2015 11:02:50 +0000 (13:02 +0200)]
Externalize strings
Cherian Mathew [Mon, 24 Aug 2015 09:13:33 +0000 (11:13 +0200)]
#4073 Initial implementation of local cdm-server
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
Patrick Plitzner [Mon, 24 Aug 2015 09:11:08 +0000 (11:11 +0200)]
Warn user that URL will not be saved in bold and red (#5065, #5141)
Patrick Plitzner [Wed, 19 Aug 2015 15:22:27 +0000 (17:22 +0200)]
Add OS and java info to MessagingUtils stacktrace
Patrick Plitzner [Wed, 19 Aug 2015 15:45:32 +0000 (17:45 +0200)]
Change order parameters in DetailsView for sources (#5133)
Patrick Plitzner [Mon, 24 Aug 2015 08:29:14 +0000 (10:29 +0200)]
Support UUID search in bulk editors (#5103)
Patrick Plitzner [Mon, 24 Aug 2015 05:10:32 +0000 (07:10 +0200)]
Trim code
Patrick Plitzner [Mon, 24 Aug 2015 05:01:43 +0000 (07:01 +0200)]
Remove comments
Patrick Plitzner [Mon, 24 Aug 2015 05:00:42 +0000 (07:00 +0200)]
Handle ampersand correctly in section titles (#5142)
Patrick Plitzner [Mon, 24 Aug 2015 08:35:20 +0000 (10:35 +0200)]
Fix application ID
Cherian Mathew [Fri, 21 Aug 2015 08:15:25 +0000 (10:15 +0200)]
#4717 Correct java exec called for macosx
Cherian Mathew [Fri, 21 Aug 2015 06:46:06 +0000 (08:46 +0200)]
#4717 Correct macosx dir structure
Cherian Mathew [Thu, 20 Aug 2015 16:59:44 +0000 (18:59 +0200)]
#4717 Correct macosx java path
Cherian Mathew [Thu, 20 Aug 2015 16:27:40 +0000 (18:27 +0200)]
#4717 Correct dir relative path to java exec for mac osx
Cherian Mathew [Thu, 20 Aug 2015 15:52:36 +0000 (17:52 +0200)]
#4717 Correct dir for changing permissions
Cherian Mathew [Thu, 20 Aug 2015 15:46:55 +0000 (17:46 +0200)]
#4717 Add seperate product file for jre bundle
U-BGBM\k.luther [Thu, 20 Aug 2015 08:37:27 +0000 (10:37 +0200)]
fix for #5114
U-BGBM\k.luther [Thu, 20 Aug 2015 08:37:27 +0000 (10:37 +0200)]
fix #5153
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
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
U-BGBM\k.luther [Tue, 18 Aug 2015 12:09:17 +0000 (14:09 +0200)]
white spaces
Cherian Mathew [Tue, 18 Aug 2015 11:47:22 +0000 (13:47 +0200)]
Correct config for molecular plugin
U-BGBM\k.luther [Tue, 18 Aug 2015 11:40:45 +0000 (13:40 +0200)]
changes for move descriptions and description elements
k.luther [Tue, 18 Aug 2015 11:35:40 +0000 (13:35 +0200)]
minor
Patrick Plitzner [Tue, 18 Aug 2015 05:51:57 +0000 (07:51 +0200)]
Remove comments
Patrick Plitzner [Mon, 17 Aug 2015 12:56:21 +0000 (14:56 +0200)]
Rename Derivative View to Derivative Editor
Patrick Plitzner [Mon, 17 Aug 2015 08:38:58 +0000 (10:38 +0200)]
Added missing molecular plugin projects
Patrick Plitzner [Mon, 17 Aug 2015 08:19:27 +0000 (10:19 +0200)]
white space changes
k.luther [Thu, 13 Aug 2015 12:13:04 +0000 (14:13 +0200)]
minor
k.luther [Thu, 13 Aug 2015 12:12:15 +0000 (14:12 +0200)]
minor
k.luther [Thu, 13 Aug 2015 12:09:31 +0000 (14:09 +0200)]
fix jenkins
k.luther [Thu, 13 Aug 2015 11:58:56 +0000 (13:58 +0200)]
fix jenkins
U-BGBM\k.luther [Thu, 13 Aug 2015 11:31:46 +0000 (13:31 +0200)]
fix #2480
U-BGBM\k.luther [Thu, 13 Aug 2015 11:29:14 +0000 (13:29 +0200)]
minor
Katja Luther [Thu, 13 Aug 2015 11:20:56 +0000 (13:20 +0200)]
fix delete polytomouskeynode and improve merge in bulk editor
Patrick Plitzner [Tue, 11 Aug 2015 08:31:35 +0000 (10:31 +0200)]
Revert last change
Patrick Plitzner [Tue, 11 Aug 2015 07:43:20 +0000 (09:43 +0200)]
Fix dependencies for LibrALign
- added swt packages to imported packages
Patrick Plitzner [Tue, 11 Aug 2015 06:41:29 +0000 (08:41 +0200)]
Depenedency management
- added javax.swing and org.eclipse swt to dependencies
Patrick Plitzner [Tue, 11 Aug 2015 05:02:42 +0000 (07:02 +0200)]
Remove unused folder
Patrick Plitzner [Mon, 10 Aug 2015 15:17:18 +0000 (17:17 +0200)]
some layout changes
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
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
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
Cherian Mathew [Tue, 4 Aug 2015 16:34:22 +0000 (18:34 +0200)]
#5129 Extend export ui for remoting
Cherian Mathew [Tue, 4 Aug 2015 16:10:56 +0000 (18:10 +0200)]
#5029 Add dev remote source quick connect
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
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
Cherian Mathew [Thu, 30 Jul 2015 10:55:10 +0000 (12:55 +0200)]
#5209 Implement auto selection of last successfully connected server / instance
Cherian Mathew [Thu, 30 Jul 2015 10:47:29 +0000 (12:47 +0200)]
#5029 Add login info to application title bar
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
Cherian Mathew [Tue, 28 Jul 2015 13:47:06 +0000 (15:47 +0200)]
Correct test method call
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
Cherian Mathew [Tue, 28 Jul 2015 12:15:19 +0000 (14:15 +0200)]
#5029 Implement oneclick login for remoting
Cherian Mathew [Fri, 24 Jul 2015 13:33:51 +0000 (15:33 +0200)]
Fix URI Syntax error for new serialised model map
Andreas Müller [Fri, 24 Jul 2015 13:25:46 +0000 (15:25 +0200)]
Fix compile error in FeaturDistributionDetailElement
Andreas Müller [Fri, 24 Jul 2015 13:25:46 +0000 (15:25 +0200)]
Fix compile error in FeaturDistributionDetailElement
Cherian Mathew [Wed, 22 Jul 2015 14:23:41 +0000 (16:23 +0200)]
#5061 Add force refresh of p2 repositories before checking for updates
Cherian Mathew [Thu, 23 Jul 2015 12:45:11 +0000 (14:45 +0200)]
Add access to service cacher
Cherian Mathew [Thu, 23 Jul 2015 12:09:21 +0000 (14:09 +0200)]
Correct serialised cdm map location
Cherian Mathew [Thu, 23 Jul 2015 11:54:34 +0000 (13:54 +0200)]
#4932 Remove autowired members, Use serliaised cdm model map
Cherian Mathew [Wed, 22 Jul 2015 14:23:41 +0000 (16:23 +0200)]
#5061 Add force refresh of p2 repositories before checking for updates
Patrick Plitzner [Wed, 22 Jul 2015 14:03:18 +0000 (16:03 +0200)]
Add button to open URLs in external browser (#5062)
Cherian Mathew [Wed, 22 Jul 2015 13:10:09 +0000 (15:10 +0200)]
Fix Polytomous Key duplicate entry issue
Patrick Plitzner [Wed, 22 Jul 2015 09:44:55 +0000 (11:44 +0200)]
Rename aggregator to lib
Patrick Plitzner [Wed, 22 Jul 2015 09:13:06 +0000 (11:13 +0200)]
Add lib folder to dependency plugin
Cherian Mathew [Wed, 22 Jul 2015 08:45:00 +0000 (10:45 +0200)]
Add missing properties file
Cherian Mathew [Wed, 22 Jul 2015 08:27:46 +0000 (10:27 +0200)]
Integrate molecular plugins
Cherian Mathew [Wed, 22 Jul 2015 07:39:09 +0000 (09:39 +0200)]
Add remoting operation / handlers for key list editor
Cherian Mathew [Tue, 21 Jul 2015 13:34:55 +0000 (15:34 +0200)]
New operation abstract class for merge
Cherian Mathew [Tue, 21 Jul 2015 11:52:01 +0000 (13:52 +0200)]
Revert change for proxy since it breaks the name editor
Patrick Plitzner [Tue, 21 Jul 2015 11:33:31 +0000 (13:33 +0200)]
Merge branch 'LibrAlign' into develop
Cherian Mathew [Tue, 21 Jul 2015 11:10:41 +0000 (13:10 +0200)]
Set security context for tests
Cherian Mathew [Tue, 21 Jul 2015 10:45:34 +0000 (12:45 +0200)]
Remove duplicate webapp war
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
Patrick Plitzner [Mon, 20 Jul 2015 16:34:06 +0000 (18:34 +0200)]
Change color when error occurs
Patrick Plitzner [Tue, 21 Jul 2015 08:54:16 +0000 (10:54 +0200)]
Disable Termeditor menu if CdmStore is disconnected
Patrick Plitzner [Tue, 21 Jul 2015 06:55:52 +0000 (08:55 +0200)]
Add missing null check
Patrick Plitzner [Tue, 21 Jul 2015 06:55:27 +0000 (08:55 +0200)]
Remove cdmViewer extension usage
Patrick Plitzner [Tue, 21 Jul 2015 06:54:31 +0000 (08:54 +0200)]
Add @Override
Patrick Plitzner [Tue, 21 Jul 2015 06:54:17 +0000 (08:54 +0200)]
Set Visibility according to CdmStore connection
Patrick Plitzner [Mon, 20 Jul 2015 16:31:02 +0000 (18:31 +0200)]
Generalize cdmViewer extension point
Refactored parameters to be based on commands.
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.
Cherian Mathew [Tue, 21 Jul 2015 10:06:29 +0000 (12:06 +0200)]
#5098 : Fix issue with authentication when using search bar