opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
40,615 Commits 69 Branches 243 Tags
6bcac4a8a9f104f4e7c35dfaf743041fc222a090
Commit Graph
40615 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
John Chilton 6bcac4a8a9 Merge pull request #7939 from mvdbeek/jmchilton-objectstore_fix 
Fix non-eager object store with nested object stores
 2019-05-17 13:12:07 -04:00
mvdbeek 3d2c243b4d Explicitly create extra_files_path when discovering outputs with extra files 2019-05-17 14:04:23 +02:00
Dannon 6ddfffcd1b Merge pull request #7991 from WilliamHolden/fix_edit_icon_share_url 
remove href from a tag to prevent backbone page reload and change som…
 2019-05-17 06:44:39 -04:00
Nicola Soranzo 75d9e33363 Merge branch 'release_19.05' into dev 2019-05-17 10:10:16 +01:00
Aysam Guerler 151f967676 Merge pull request #7986 from jmchilton/jobs_selenium_fix 
Fix Selenium tests for job management screenshot.
 2019-05-16 15:55:48 -04:00
will efcb9d229d remove href from a tag to prevent backbone page reload and change some vars to const 2019-05-16 15:30:09 -04:00
John Chilton 5496aad8a1 Fix Selenium tests. 
https://jenkins.galaxyproject.org/job/docker-selenium/6478/artifact/6478-test-errors/test_admin_server_display2019051612081558008530/

Likely broken with https://github.com/galaxyproject/galaxy/pull/7790.
 2019-05-16 14:01:48 -04:00
Dannon 8564c6e9f0 Merge pull request #7985 from WilliamHolden/remove_colon_no_port 
Only show colon when a port exists in URL
 2019-05-16 12:40:40 -04:00
Dannon 75b5b4e39d Merge pull request #7983 from AndreasSko/release_19.05 
Fixed wrong example for amqp_ack_republish_time in job_conf.xml.sample_advanced
 2019-05-16 10:14:37 -04:00
will ecf4814b67 Only show colon when a port exists in URL 2019-05-16 09:29:47 -04:00
John Chilton 3ac0bf874c Merge pull request #7979 from mvdbeek/fix_attachable 
[19.05] Fix attachable for multiple="true" list input
 2019-05-16 07:52:00 -04:00
Andreas Skorczyk a213c06c5f Fixed wrong example for amqp_ack_republish_time 
"amqp_republish_time" should be "amqp_ack_republish_time "
 2019-05-16 12:08:24 +02:00
mvdbeek b6a7f528fd Fix attachable for multiple="true" list input 
This fixes https://github.com/galaxyproject/galaxy/issues/7963
 2019-05-15 22:52:00 +02:00
Aysam Guerler 83581b23cd Merge pull request #7790 from scrathat/admin.jobs.vue.rewrite 
Vue rewrite of admin jobs page
 2019-05-15 16:34:52 -04:00
John Chilton 96d3f85372 Merge pull request #7972 from mvdbeek/subworkflow_simple_inputs 
[19.05] Include type in subworkflow parameter input module
 2019-05-15 14:09:35 -04:00
mvdbeek 2e9deddfa2 Include type in subworkflow module 
Fixes https://github.com/galaxyproject/galaxy/issues/7964,
thanks for the report @innovate-invent
 2019-05-15 17:51:11 +02:00
Marius van den Beek fbb3eaf500 Merge pull request #7969 from jmchilton/backport_7966 
[19.05] Backport 7966
 2019-05-15 16:33:14 +02:00
Marius van den Beek a14f514038 Merge pull request #7953 from jmchilton/fix_test_uploads 
Fix populators.py workflow testing for non-text inputs.
 2019-05-15 16:12:31 +02:00
John Chilton fd76faa928 Merge pull request #7945 from jxtx/dev 
cellxgene GIE: use API to get datasets.
 2019-05-15 08:19:40 -04:00
M Bernt 9658bc6e0c output_checker: added missing state in output 2019-05-15 08:11:56 -04:00
M Bernt f05c20e85f output_checker: fixed linter issues 2019-05-15 08:11:55 -04:00
M Bernt 63959e1b5c output_checker: fixed wrong comparison 
- fixed comparison (which was always true before -- except if my
intuition on how Bunch works is wrong)
- always log state to info
 2019-05-15 08:11:54 -04:00
John Chilton a9f0048ceb Merge pull request #7966 from bernt-matthias/topic/output_checker_bugfix 
output_checker: fixed wrong comparison
 2019-05-15 08:10:39 -04:00
M Bernt 23e9a35d9b output_checker: added missing state in output 2019-05-15 11:26:50 +02:00
M Bernt 55e8f3a45b output_checker: fixed linter issues 2019-05-15 10:59:12 +02:00
M Bernt 9220d2f39a output_checker: fixed wrong comparison 
- fixed comparison (which was always true before -- except if my
intuition on how Bunch works is wrong)
- always log state to info
 2019-05-15 10:09:48 +02:00
Sebastian Kapust c644deebc7 Remove custom css 2019-05-15 01:27:45 +02:00
Sebastian Kapust 9c9a4eaaa9 Simplify UI for setting admin job lock 2019-05-15 01:14:29 +02:00
Dannon bf4327f20d Merge pull request #7927 from WilliamHolden/keyboard_input 
change keyboard input for floats and switch to es6 features
 2019-05-14 15:02:17 -04:00
Martin Cech 6ca03701bb Merge pull request #7958 from dannon/backport_revise_data_dialog 
[19.05] Backport of revise data dialog #7935
 2019-05-14 14:25:04 -04:00
Martin Cech 852b82ea0b Merge pull request #7956 from dannon/backport_requirejs_template_removal 
[19.05] Backport requirejs inclusion in templates removal
 2019-05-14 11:33:48 -04:00
Dannon Baker 04f20280ab Client format. 2019-05-14 10:48:43 -04:00
guerler c4df90da6b Adjust dialog test cases 2019-05-14 10:46:45 -04:00
guerler 4e5e07dd31 Format code, remove previous label test 2019-05-14 10:46:32 -04:00
guerler 86651d81d5 Remove view icon, focus on selecting datasets only, use folder icon 2019-05-14 10:46:24 -04:00
guerler 1064346866 Use cross-icon instead of clear label in search field 2019-05-14 10:46:14 -04:00
guerler d00e4da5b7 Fix library flag handling, explicitly set to boolean 2019-05-14 10:46:08 -04:00
guerler 32b8994c46 Hide Ok button if only one item can be selected 2019-05-14 10:46:02 -04:00
Dannon b9c22de001 Merge pull request #7955 from jmchilton/re-release_19.05 
[19.05] Re-version 19.05 as 19.05 - introducing the new 19.05.
 2019-05-14 10:42:30 -04:00
Dannon Baker c9b510152a Drop requirejs from base mako as well -- we don't use this anywhere in core 2019-05-14 08:45:12 -04:00
Dannon Baker 18c2e9483f Drop requirejs from js-app mako template; this is all bundled code 2019-05-14 08:45:07 -04:00
John Chilton b03f0136a2 Re-version 19.05 as 19.05. 2019-05-14 08:16:21 -04:00
John Chilton 703c968788 Merge pull request #7944 from mvdbeek/expression_tool_improvements 
[19.05] Allow mapping over of expression tool params
 2019-05-14 08:12:38 -04:00
Marius van den Beek 54190a9629 Merge pull request #7943 from guerler/fix_history_tool_form_refresh 
[19.05] Listen to history changes in tool form until job has been submitted
 2019-05-14 13:52:59 +02:00
Nicola Soranzo 9ec6e8e545 Merge pull request #7954 from mvdbeek/no_jwd_in_stdout 
[19.05] Fix job working directory in stdout
 2019-05-13 22:37:58 -04:00
mvdbeek 3fb32df829 Make sure collections are populated before replacing parameters 2019-05-14 00:14:34 +02:00
mvdbeek 556ee003ae Fix parse_values_from_file tool and tests 2019-05-14 00:14:34 +02:00
mvdbeek 284f7bc46b Rework delaying/cancelling workflow evalation with non-data inputs 
We try to fail early if any (expression.json) dataset in a dataset
collection is not OK. Probably cheaper then delaying execution
many times.
 2019-05-14 00:14:34 +02:00
mvdbeek 974f45b043 Allow mapping over of expression tool params 
This allows feeding a collection of parameters values to a parameter
value. This enables https://github.com/galaxyproject/tools-iuc/pull/2404#issuecomment-491740393
for instance, where we normalize a collection based on a computed
parameter.
 2019-05-14 00:14:34 +02:00
mvdbeek 09eeeec956 Fix job working directory in stdout 2019-05-13 23:52:23 +02:00