opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
38,017 Commits 62 Branches 243 Tags
4e1d93fb8920b7553c4532e7b44a3096cbd36e1c
Commit Graph
38017 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mason 4e1d93fb89 Merged dev, included store reference in bundleEntries 2018-12-26 10:37:53 -08:00
Mason e16da9feca Added bundleEntries.getGalaxyInstance to tour generator, corrected similar global problem in library folder 2018-12-26 10:29:49 -08:00
John Chilton 26c950f569 Merge pull request #7053 from nuwang/pulsar_resubmit 
Added resubmit handlers on Pulsar connection failures
 2018-12-21 17:46:35 -05:00
John Chilton abf98be783 lint fix 2018-12-21 17:08:31 -05:00
Dannon e4e2d9c09a Merge pull request #6484 from anilthanki/aequatus-vis 
Adds Aequatus visualisation plugin
 2018-12-21 16:35:14 -05:00
Dannon e8d95fba71 Merge pull request #7149 from Nerdinacan/include_store_in_bundleEntries 
added store library to exported libs in bundleEntries
 2018-12-21 14:22:42 -05:00
Dannon 9de86adc06 Merge pull request #7134 from jmchilton/remove_flushes 
Remove unneeded session flushes and adds when discovering outputs.
 2018-12-21 14:19:36 -05:00
Dannon Baker 3af7a5c1a7 Client format I intended to lump into display applications merge. 2018-12-21 14:14:25 -05:00
Dannon 3c2858ab0c Merge pull request #7097 from guerler/display_applications 
Replace display applications mako with vue component
 2018-12-21 14:13:17 -05:00
Mason fbf67196ff added store library to exported libs in bundleEntries 2018-12-21 10:44:23 -08:00
Dannon 38687ff15a Merge pull request #7148 from ic4f/dev 
Correct code error in 'build job runner' tutorial
 2018-12-21 13:40:28 -05:00
Sergey Golitsynskiy 0bd861aec7 Code style improvement to previous commit 2018-12-21 13:23:41 -05:00
Mason ecda8509da Merged dev... again 2018-12-21 09:47:43 -08:00
Sergey Golitsynskiy 5d8e0bb049 Correct code error in 'build job runner' tutorial 
When  __init__ is called, **kwargs (most likely) will not contain
the 'runner_param_specs' key. And if so, calling update() on
kwargs['runner_param_specs'] will cause an error. Check if key exists,
then update or create.
 2018-12-21 12:42:25 -05:00
John Chilton 0727f17ade Fixes for Pulsar error handling. 
More uniform error hanlding to fix test. Simplify test case of resubmission to test just jobs resubmit properly (no need to test Pulsar-to-Pulsar resubmission in particular here I don't think, maybe as a second test - but not a first?).
 2018-12-21 11:16:38 -05:00
John Chilton cd119d641a Merge remote-tracking branch 'jmchilton/dev' into pulsar_resubmit 2018-12-21 09:51:10 -05:00
Martin Cech 288453d4d0 Merge pull request #7087 from dfornika/mash-sketch-datatype 
Add datatype for Mash Sketch files.
 2018-12-20 16:48:52 -05:00
anilthanki 1c82d08ab5 adds Aequatus visualisation plugin 
updates Aequatus control panel-settings font size

Update README.md

fix path to aequatus static scripts

updates with upstream

removes console

removes installation guide

removes demo

removes duplicates

removes d3.js

removes bootstrap

prunes font-awesome

removes less of font-awesome

removes scss of font-awesome

uses font-swesome min

removes bootstrap

removes leftandright css class

updates jQuery and changes css class for popup

updates jQuery

updates fontawesome to 5.6.1

restore galaxy.yml.sample

add missing resource

update paths after updating font

remove console log

switch to minified jquery ui
 2018-12-20 16:14:23 -05:00
Dannon Baker 7eca9baf5a Merge branch '7132_fix_cors_singleton_storage' into dev 2018-12-20 15:52:54 -05:00
Dannon Baker cf7f1b0745 Client formatting. 2018-12-20 15:52:02 -05:00
John Chilton 6a0a6ec1d1 Merge pull request #7136 from mvdbeek/remove_tools_without_deps 
Drop tools without installable dependencies
 2018-12-20 08:17:01 -05:00
mvdbeek 1edb7489a1 Drop tools without installable dependencies 
These seem to be beyond legacy, and since their not installable let's
drop them from the default config. I left them in tool_conf.xml.main,
since they appear to be installed on main.
 2018-12-20 10:52:10 +01:00
Mason 60146ec89b Replaced test code with real code 2018-12-19 14:14:14 -08:00
Mason 6f669dd79b 7132 Updated singleton to address cors issue in toolshed frames 2018-12-19 14:06:08 -08:00
John Chilton 9bbdb34fb6 Remove unneeded session flushes and adds when collecting primary datasets. 2018-12-19 12:43:04 -05:00
guerler 558aca71d6 Replace default links with bootstrap vue buttons 2018-12-19 11:25:46 -05:00
guerler e237bcfd16 Use b-alert instead of basic bootstrap alert messages 2018-12-19 11:19:47 -05:00
Dannon 1854c934cb Merge pull request #7115 from ic4f/feature_i6330 
[WIP] Enable tagging+annotation of jobs regardless of state
 2018-12-19 10:00:12 -05:00
Dannon Baker 5a666eb656 Avoid using underscore where there's a vanilla alternative. 2018-12-18 21:52:18 -05:00
Dannon Baker a3d1c6872b Minor formatting; tabstop=4 2018-12-18 20:25:36 -05:00
Martin Cech e31274b7f5 Merge pull request #7131 from jmchilton/extra_files_3 
Fixes and tests for collecting extra files for discovered datasets.
 2018-12-18 18:54:49 -05:00
John Chilton 953730d61c Tests for tool provided metadata specifing extra files. 2018-12-18 15:54:43 -05:00
John Chilton 62a7c40ba4 Fix for testing extra files in tool tests. 
Wouldn't be testing if primary file didn't specify a filename to test against.
 2018-12-18 15:54:43 -05:00
John Chilton e1e32cdcc6 Test for 'metadata' in newer style discovered primary datasets. 2018-12-18 15:47:25 -05:00
Martin Cech b7bb1df769 Merge pull request #7127 from pvanheus/patch-10 
Update help text as per suggestion from CWunder
 2018-12-18 11:44:04 -05:00
guerler a00d013fd1 Remove admin requirment from index endpoint of display applications 2018-12-18 09:12:59 -05:00
pvanheus 22e1350f7a Update help text as per suggestion from CWunder 
This [thread](https://help.galaxyproject.org/t/clearer-documentation-for-filter-list/231) suggests that the help text for this tool is not clear. This PR attempts to address that weakness.
 2018-12-18 14:35:35 +02:00
Dannon faec3dc058 Merge pull request #7123 from jmchilton/collected_remove 
Remove unused __collected_datasets__ from tool hook dict.
 2018-12-17 19:29:52 -05:00
John Chilton fe349ef334 Remove __collected_datasets__ from hook dict. 
Added for Tool subclass hooks in ca8cc1420e but doesn't seem to be used in any tool implementation hooks.
 2018-12-17 14:23:12 -05:00
Mason c796928865 Removed separate stylesheet 2018-12-17 10:44:04 -08:00
Mason e06b497276 Removed global functionality out of masthead 2018-12-17 10:42:12 -08:00
Aysam Guerler d7539d07eb Merge pull request #7122 from dannon/collection_jobstate_animation_fix 
Fixes state-change animations causing 'block' display
 2018-12-17 13:25:10 -05:00
guerler f5b7553fea Add require admin to display applications api 2018-12-17 12:56:27 -05:00
Mason efd7560af3 Merge branch 'dev' into init_queue_2 2018-12-17 09:09:23 -08:00
Dannon Baker 0fdb89a1b4 Fixes state-change animations causing 'block' display appearing in 
various places due to collection job state fetches.  Includes some
import/export refactoring and general client cleanup.
 2018-12-17 11:38:36 -05:00
Nicola Soranzo b22b7e5868 Merge branch 'release_18.09' into dev 2018-12-16 23:02:41 +00:00
Nicola Soranzo 65ca25ed66 Merge branch 'release_18.05' into release_18.09 2018-12-16 22:56:39 +00:00
Nicola Soranzo bfc634e415 Merge branch 'release_18.01' into release_18.05 2018-12-16 22:54:49 +00:00
Nicola Soranzo 6feef2a280 Merge branch 'release_17.09' into release_18.01 2018-12-16 22:53:32 +00:00
Nicola Soranzo fdd9a091f8 Merge branch 'release_17.05' into release_17.09 2018-12-16 22:44:54 +00:00