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
22,019 Commits 62 Branches 243 Tags
6e34858e0da7b08075bff946ae5cd2d9d09e6234
Commit Graph
11577 Commits
Author SHA1 Message Date
John Chilton 6e34858e0d Merge pull request #2010 from guerler/fix_collection_select 
Fix parameter expansion for empty collections
 2016-03-25 10:54:33 -04:00
John Chilton 84044f9a5f Merge pull request #2002 from dannon/statswork 
Much more friendly route mapping.
 2016-03-25 10:53:48 -04:00
John Chilton 86d2b29026 Merge pull request #1993 from guerler/revise_parameters_000 
Fix inconsistency in update state handling for tool modules
 2016-03-24 16:39:26 -04:00
guerler 72b1ba3714 Fix parameter expansion for empty collections 2016-03-24 16:29:13 -04:00
guerler eaf8f4ed50 Extend doc tests for parameter handling 2016-03-23 16:20:51 -04:00
guerler c1fe8aac0a Fix inconsistency in update state handling for tool modules 2016-03-23 14:28:07 -04:00
Dannon Baker 033241c99f Merge 16.01, rebuild. 2016-03-23 12:39:06 -04:00
Martin Cech 21e71a9b46 Merge pull request #1905 from dannon/library_errors 
[16.01] Encoding in libraries
 2016-03-23 12:04:27 -04:00
guerler 946458b892 Fix booleans 2016-03-23 11:09:43 -04:00
Dannon Baker 975c6f5eae Much more friendly route mapping. 2016-03-22 17:35:14 -04:00
Nicola Soranzo d10ee6f6c4 Merge branch 'release_16.01' into dev 
Conflicts:
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
 2016-03-22 20:54:32 +00:00
Nicola Soranzo 9eb1db82ca Do not convert spaces to tabs when importing datasets into a library. 
Reported (with fix provided) by Fabien Mareuil in
http://dev.list.galaxyproject.org/automatic-adding-of-a-tab-in-a-fastq-header-td4669160.html
 2016-03-22 20:03:32 +00:00
Dannon Baker 0dc57b08e8 Merge pull request #1974 from jmchilton/docker_fix 
Fix docker tool execution for #1688.
 2016-03-22 12:42:16 -04:00
Dannon Baker 45c1731888 Merge branch 'release_16.01' into dev 2016-03-22 09:18:55 -04:00
Björn Grüning 30750c32e4 Merge pull request #1880 from dannon/fix_migration_0131_mysql 
[16.01] Fixes to subworkflow migration 0131
 2016-03-22 14:14:43 +01:00
John Chilton 55e8ef6e1d Optimize adding datasets to large histories. 2016-03-22 13:12:15 +00:00
John Chilton c26788a267 Merge pull request #1971 from guerler/fix_nginx_upload_000 
Fix nginx-based file upload
 2016-03-22 07:51:33 -04:00
John Chilton 975937ec9d Fix docker tool execution for #1688. 
Thanks for @kellrott for the bug report.

\#minor
 2016-03-22 10:02:32 +00:00
guerler 4e3ca993f2 Fix nginx-based file upload 2016-03-21 20:44:22 -04:00
Dannon Baker 35e75d11ce Merge branch 'release_16.01' into dev. 
Rebuild client.
 2016-03-21 19:33:05 -04:00
Dannon Baker 566f556b07 Merge pull request #1952 from guerler/fix_tool_access_000 
[16.01] Fix tool access rights and forwarding
 2016-03-21 19:29:31 -04:00
Dannon Baker 8d37aeff50 Manual merge to resolve conflict 16.01->dev 2016-03-21 16:36:48 -04:00
Dannon Baker 377ccbe23b Merge pull request #1967 from jmchilton/fix_optional_numeric_params 
[16.01] Fix #1721.
 2016-03-21 16:18:27 -04:00
John Chilton 2efd9c2687 Fix #1721. 
TODO: write test...
 2016-03-21 13:51:26 +00:00
John Chilton 5df7830424 Do not use "is not" to compare strings. 
http://stackoverflow.com/questions/1504717/why-does-comparing-strings-in-python-using-either-or-is-sometimes-produce
 2016-03-21 12:06:35 +00:00
John Chilton 5ead8a95d1 Merge pull request #1941 from bgruening/chemical_datatypes 
add chemical datatypes
 2016-03-21 11:49:31 -04:00
John Chilton c8cb4280c1 Fix datatype sniff test to use sample and revert molecule registry hacks. 2016-03-21 09:53:21 +00:00
John Chilton 09a0e9395d More job related timing logging. 
- Log time of big flush statement.
 - Log time of adding datasets to history.
 - Log time for setting up job.

These log statements would make the output of the following gist (https://gist.github.com/blankenberg/43db2e0f61a566126c45) from #1831 a lot more informative.
 2016-03-21 01:03:25 +00:00
John Chilton 9e9dfdfd55 Fix workflow scheduler log message. 2016-03-21 00:51:18 +00:00
Bjoern Gruening 1e9b0e6dbd add molecule datatypes, like PDB and some cheminformatic ones 2016-03-20 18:06:14 +01:00
Martin Cech d0ceb29bd8 Merge pull request #1953 from mvdbeek/warn_if_user_inactive 
Warn if tool is executed and user account is inactive
 2016-03-20 11:40:52 -04:00
Marius van den Beek 34dedb3eb9 linting fixes 2016-03-20 12:04:33 +01:00
Marius van den Beek 3b71020dfc Account for anonymous user. 2016-03-20 11:49:21 +01:00
Marius van den Beek 9d362a2400 log warning if user account is not active 2016-03-20 10:24:37 +01:00
guerler 054fdf76f0 Parse user when filtering tools 2016-03-18 20:48:24 -04:00
guerler bd0439d9b7 Fix tool access rights and forwarding 2016-03-18 20:12:21 -04:00
Dannon Baker 53daf30dd2 Merge branch 'release_16.01' into dev 2016-03-18 15:41:14 -04:00
Daniel Blankenberg 87bb98eed2 Add "new" state to list of dataset states in saved history list. 2016-03-17 16:37:20 -04:00
Dannon Baker 2bc3da6b49 Merge pull request #1948 from jgoecks/history-grid-state-optimization 
Use database query rather than dataset iteration to compute dataset c…
 2016-03-17 15:51:02 -04:00
Dannon Baker e3e49a477d extreme casting to 1) make this code actually work with python 2, and 3) work should the web framework ever be functional in python3 2016-03-17 15:49:23 -04:00
Dannon Baker 78da8df812 Oops. 2016-03-17 15:20:27 -04:00
Dannon Baker 4520a619ab Minor style tweaks to pass flake8 2016-03-17 15:11:56 -04:00
Dannon Baker 4ef186812f Encode user_login as utf8 prior to directory manipulation. 2016-03-17 14:45:46 -04:00
jgoecks 6a123b12e9 Use database query rather than dataset iteration to compute dataset counts in saved histories grid. 2016-03-17 14:35:20 -04:00
Dannon Baker 98c65dcee0 Swap back to the first fix, update metrics api to use new signature. 2016-03-17 13:13:19 -04:00
Dannon Baker 87bcb5f5a1 Fix in a different way not requiring signature change; still not thrilled about overlapping kwarg names w/ stdlib module names. 2016-03-17 12:09:02 -04:00
Dannon Baker f277f99aed Fix handling of time in fluent logger. 2016-03-17 11:43:52 -04:00
Martin Cech c7d1f009a1 Merge pull request #1935 from guerler/fix_downloads_000 
Fix tool downloads in tool form
 2016-03-17 11:01:27 -04:00
Martin Cech cef58abb55 Merge pull request #1943 from davebx/ts_api_bug 
Fix API method broken in 6e13c3999.
 2016-03-17 11:00:39 -04:00
Dave Bouvier ad6edac562 Also prevent server error when repository is not found. 2016-03-17 10:19:31 -04:00