opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,198 Commits 63 Branches 243 Tags
f540a16768307995ea49c5d241948537ebbfa540
Commit Graph
11140 Commits
Author SHA1 Message Date
Nate Coraor f540a16768 Add a safe_relpath util function for ensuring a path does not reference an absolute or parent directory 2016-02-24 11:18:23 -05:00
Daniel Blankenberg 6bb43aa4af Merge pull request #1786 from jmchilton/format_source_restrictive 
[16.01] format_source in workflow editor is too restrictive.
 2016-02-23 17:57:47 -05:00
John Chilton a5c30c563e Merge pull request #1771 from mvdbeek/16.01_fix_ies 
[16.01] Remove len(stderr), breaks on recent docker versions
 2016-02-23 17:42:27 -05:00
John Chilton b402093479 format_source in workflow editor is too restrictive. 
Case made well by @erasche on #1746, fixes #1746.

To resolve this more correctly (and many other potential type problems) - the workflow editor should be significantly reworked to track the datatype (or a range of datatypes) on each terminal (the way it does for collection mapping information). The change would be a weeks worth of development effort and inappropriate to apply to a release branch.
 2016-02-23 17:16:27 +00:00
Nicola Soranzo 5ce771b70e Strip URL of download_file and download_by_url install actions. 2016-02-23 14:47:23 +00:00
Marius van den Beek a47a4f40b4 Remove len(stderr), breaks on recent docker versions 2016-02-22 11:56:21 +01:00
Nicola Soranzo b5e91d2377 Merge branch 'release_15.10' into release_16.01 
Conflicts:
	lib/galaxy/util/__init__.py
 2016-02-19 11:41:10 +00:00
Nicola Soranzo ef93629719 Fix pretty_print_time_interval for MySQL. Fix #1619. 2016-02-18 20:08:14 +00:00
Daniel Blankenberg b4c823f2cd Merge pull request #1758 from jmchilton/ts_section_fix 
[16.01] Fix updating in-memory tools for tool shed installs into sections.
 2016-02-18 15:03:52 -05:00
Nicola Soranzo 3f34131ff5 Merge branch 'release_15.10' into release_16.01 
Conflicts:
	lib/galaxy/version.py
 2016-02-18 19:40:14 +00:00
Nicola Soranzo 587d450402 Fix installation of Tool Shed repositories containing non-ASCII characters in the description. Fix #1702. 2016-02-18 17:44:08 +00:00
John Chilton 4c0993cc42 Fix updating in-memory tools for tool shed installs into sections. 2016-02-18 13:04:18 +00:00
Dannon Baker 37b98b773e Load whitelist regardless of whether the setting is explicit in config. 
This is a sensible enough default, and requiring the option to be set in
galaxy.ini is cumbersome and unnecessary since it's admin-only
functionality.
 2016-02-17 09:29:29 -05:00
John Chilton 4a566b6db8 Improved debug message in workflow scheduling. 2016-02-16 12:25:15 +00:00
Marius van den Beek 75a3797d0f Also fix legacy export. 2016-02-15 14:05:45 +01:00
John Chilton e0ee1203c6 Fix problem with legacy workflows and duplicate output labels. 
Fixes #1704 - many thanks to @tzk and @mvdbeek.
 2016-02-12 11:02:51 +00:00
Martin Cech 776180ab80 show all available information for current library and the opened folder 2016-02-09 10:24:02 -05:00
Martin Cech 5301269fbb update docs of the data libraries API 2016-02-05 12:12:53 -05:00
Martin Cech e7b6b4b13b Revert "delete the 'payload' if it is in kwd so it is not supplied twice" 
This reverts commit 134d792c1f.
 2016-02-05 11:32:37 -05:00
Martin Cech 134d792c1f delete the 'payload' if it is in kwd so it is not supplied twice 2016-02-05 11:06:19 -05:00
Martin Cech 170c83e6c2 fix unused imports and unused vars 2016-02-04 22:45:33 -05:00
Martin Cech b46636a53f remove deletion of the payload dict item 
it is not necessary and the key does not have to exist
 2016-02-04 20:42:45 -05:00
Martin Cech a4c2098da0 allow PATCHing with payload in urlparams 2016-02-04 15:54:30 -05:00
Martin Cech 7867f3e083 accept json as input for setting permissions; 
fix inconsistency by leveraging role_manager
 2016-02-04 15:51:57 -05:00
Martin Cech c288b43627 allow creating folders with JSON payload 2016-02-04 15:10:02 -05:00
Martin Cech 4b51be57d1 allow specifying DELETE params in JSON 2016-02-04 15:04:42 -05:00
Martin Cech 0398aafb1c fix updating library API to not require payload 
and to properly handle optional params
 2016-02-04 15:00:14 -05:00
Martin Cech edd8b222ac catch value errors from id decoding 2016-02-04 14:43:45 -05:00
Martin Cech 5dd839960e unify api for library creation; support POST with url params 2016-02-04 14:30:31 -05:00
Martin Cech 530501c682 fix setting library permissions to accept JSON correctly 2016-02-04 14:23:15 -05:00
Martin Cech ada39dea6a handle correctly application/json pased in POST 2016-02-04 13:05:24 -05:00
Aysam Guerler bb95a65b22 Merge pull request #1666 from martenson/correct-datatype-typo 
[16.01] correct typo in text datatype
 2016-02-03 13:27:22 -05:00
Nate Coraor cd3f3b330d Merge pull request #1638 from dannon/pysam_84_update 
Pysam 84 update [16.01]
 2016-02-03 13:04:10 -05:00
Martin Cech bf989f6051 correct typo in text datatype 2016-02-03 12:44:26 -05:00
John Chilton a95827751f Merge pull request #1637 from guerler/fix_optional_001 
[16.01] Prevent optional test parameters in conditionals
 2016-02-02 19:12:13 -05:00
Dannon Baker d6325c5039 Update data providers pysam.AlignmentFile usage 2016-02-02 15:08:24 -05:00
Dannon Baker 66f20e7df9 Fix method signature of bam.set_meta to include a positional argument which is now required. 2016-02-02 13:56:40 -05:00
John Chilton afc5f2a453 Fix: Use dependency resolvers if any config exists. 
This way resolvers like the Module resolver work even if tool_dependency_dir is not set.
 2016-02-02 08:57:03 +00:00
Dannon Baker 6fa7f1e1ed Bump pysam to new 0.8.4+gx1. 2016-02-01 13:24:42 -05:00
Martin Cech 30ccebfb0c remove forgotten util.params that fails when POSTing a payload{} dict 
(because it cannot sanitize dict in dict)
 2016-02-01 11:28:57 -05:00
John Chilton 17a1683a38 Warn on optional select test parameter. 2016-02-01 14:03:20 +00:00
guerler ccdb027d38 Prevent optional test parameters in conditionals 2016-02-01 13:10:39 -05:00
John Chilton 81535c5778 Merge pull request #1500 from blankenberg/peek-fix 
[16.01] Fix line wrapping for peek of tabular files.
 2016-01-29 12:49:12 -05:00
John Chilton 981f904c3f Attempt to fix transiently failing test due to object store makedirs call. 
Failing test - https://jenkins.galaxyproject.org/job/docker-api/2421/testReport/junit/api.test_workflows/WorkflowsApiTestCase/test_workflow_metadata_validation_0/.

If you look at the actual source code for os.makedirs - it does inconsistently handle errno.EEXIST - this is probably a better approach than raw os.makedirs for most cases.

xref #1617
 2016-01-29 14:50:29 +00:00
John Chilton c60ddc241b Merge pull request #1599 from carlfeberhard/fix.hdca-copy 
[16.01] Core, HDCAs: fix 'copy_item_annotation' error when copying a history …
 2016-01-28 10:20:55 -05:00
carlfeberhard 55f67e59d6 Core, HDCAs: fix 'copy_item_annotation' error when copying a history with an hdca by adding UsesAnnotations mixin to HDCA model 2016-01-27 14:04:53 -05:00
carlfeberhard b1ae5d8c67 UI, users: allow '/user' and '/user/' to default controller and correctly return the user/index.mako template (preventing an internal error) 2016-01-27 08:54:13 -05:00
John Chilton c2d94c43bb Merge pull request #1560 from natefoo/conda-interop 
[16.01] Add a requirements file suitable for use with `conda {create,install} --file`
 2016-01-26 16:49:25 -05:00
Nate Coraor 1486af0ef9 Rename conda-requirements.txt to conda-environment.txt since it is not a 
requirements file, include instructions on how to install remaining
dependencies from pip.
 2016-01-26 16:46:20 -05:00
Martin Cech 35f90da20c Merge pull request #1542 from jmchilton/did_fix 
[16.01] Attempt to fix #1531.
 2016-01-26 16:24:42 -05:00