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
24,083 Commits 69 Branches 243 Tags
v16.07
Commit Graph
24083 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
John Chilton e0aad7af47 Update version to 16.07 v16.07 2016-08-25 13:41:10 -04:00
John Chilton 992cd51ac3 Merge pull request #2855 from martenson/fix-ts-unicodify 
[16.07] unicodify TS main template
 2016-08-25 12:56:23 -04:00
Martin Cech e5a1cabe8e unicodify time on shed counter 
to prevent problems with dates that contain non-ascii
 2016-08-25 11:44:00 -04:00
John Chilton fad13d50c3 Merge pull request #2851 from martenson/backport_2794_2826 
[16.07] Backport conda fixes
 2016-08-24 18:05:39 -04:00
Bjoern Gruening e9d81500ca shorten Conda environment names 2016-08-24 15:12:54 -04:00
Marius van den Beek a2f234d566 Create default tool_dependency dir if it doesn't exist 2016-08-24 15:12:44 -04:00
Marius van den Beek 8b67ddfa37 Acquire lock before attempting to install conda 2016-08-24 15:12:38 -04:00
John Chilton 3248b679ac Merge pull request #2850 from martenson/docs_conda 
[16.07] conda docs - add TOC
 2016-08-24 13:37:39 -04:00
John Chilton df47bd2007 Merge pull request #2821 from martenson/16.07_release_notes 
[16.07] curated release notes for 16.07
 2016-08-24 13:36:16 -04:00
Martin Cech 08b2bda13b change links to target official docs 2016-08-24 13:18:26 -04:00
Martin Cech 7326498335 improve conda doc to include TOC 2016-08-24 12:25:10 -04:00
Dannon Baker 124d546be6 Merge pull request #2844 from martenson/docs_conda 
[16.07] add conda docs converted and modified from IUC googledoc
 2016-08-24 11:45:28 -04:00
Martin Cech 779c357dca Merge branch 'docs_conda' of https://github.com/martenson/galaxy into docs_conda 2016-08-24 11:43:13 -04:00
Martin Cech 3d0bf645ab fix tiny things in docs 2016-08-24 11:28:32 -04:00
Martin Cech b4495c1a8b Merge pull request #17 from dannon/docs_conda 
Conda/conda standardization
 2016-08-23 20:29:07 -04:00
Dannon Baker e52dbde3e4 Conda/conda standardization 2016-08-23 17:45:56 -04:00
Martin Cech aedfdffafe add more literal includes 2016-08-23 17:41:07 -04:00
Martin Cech 453c98d8ad this one is even weirder than the ones before 2016-08-23 17:35:03 -04:00
Martin Cech e33f8fe5b6 replace apostrophes 2016-08-23 17:33:25 -04:00
Martin Cech 04f22b70a4 fix plural, split lines to prevent indentation 2016-08-23 17:14:27 -04:00
Martin Cech 01a24f6560 rst problems 2016-08-23 15:53:37 -04:00
Martin Cech 4d19755c13 add conda docs converted and modified from IUC googledoc 2016-08-23 15:44:46 -04:00
Martin Cech a1b2ec386e Merge pull request #2843 from erasche/chat-docs 
[16.07] Document the Chat Server
 2016-08-23 14:22:37 -04:00
Eric Rasche c6c646ead4 Document the Chat Server 2016-08-23 18:18:30 +00:00
Marius van den Beek c33bf2a222 Merge pull request #2825 from mvdbeek/conda_install_fix 
Inject HOME, so that conda doens't attempt to write to ~/.conda
 2016-08-23 18:21:35 +02:00
Martin Cech 26ceef668c announce conda as beta, link the IUC doc, link DTD wiki 2016-08-22 14:05:44 -04:00
Martin Cech 3d4300e542 tweak wording of notes 2016-08-22 11:56:14 -04:00
Martin Cech f0ffa9c594 drop GRT reference 2016-08-22 11:51:06 -04:00
John Chilton 8f571bae71 Wording fix thanks to @nsoranzo. 2016-08-22 11:47:22 -04:00
John Chilton 0437084545 Another spelling fix thanks to @nsoranzo. 2016-08-22 11:46:29 -04:00
John Chilton e1060bd18f Spelling fix thanks to @nsoranzo. 2016-08-22 11:44:28 -04:00
John Chilton 9b96d9dbfa More user-focused language in release notes. 2016-08-22 11:31:10 -04:00
Martin Cech c82719f22d drop subheaders, reorder, tweak to wording 2016-08-22 11:09:31 -04:00
John Chilton 113999e5d5 Tweaks to language of many of enhancements in 16.07 release notes. 2016-08-22 10:59:13 -04:00
Martin Cech 96bdde85bf add a highlight, update git commands 2016-08-22 10:34:51 -04:00
Nicola Soranzo 53570e471e Merge some entries, rephrasing and fixes 2016-08-22 12:22:41 +01:00
Marius van den Beek 873f34f079 Inject HOME, so that conda doens't attempt to write to ~/.conda 2016-08-20 19:05:11 +02:00
Martin Cech f47ea88c23 initial curated release notes for 16.07 2016-08-19 13:05:05 -04:00
Nicola Soranzo f4806e9dd4 Merge branch 'release_16.04' into release_16.07 2016-08-18 15:49:30 +01:00
Martin Cech 3492e96574 Merge pull request #2811 from nsoranzo/release_16.04_backports 
[16.04] Two backports
 2016-08-18 10:08:48 -04:00
Dave Bouvier a134587c89 Correctly check set_environment declarations when updating repository. 2016-08-18 14:08:40 +01:00
Nicola Soranzo 1f69bf32e8 Fix run.sh --daemon 
Broken in commit d5c52cadfd .
Partial backport from #2765 .
Close #2724.
 2016-08-18 14:07:26 +01:00
Martin Cech 6c2468832b Merge pull request #2809 from carlfeberhard/fix.hdca-dnd 
[16.07] API, history contents: allow 'source' in payload
 2016-08-17 16:08:14 -04:00
Dannon Baker 30d5b45d43 Merge pull request #2810 from natefoo/split-kwargs 
[16.07] Revert str.split() syntax for Python 2 compatibility
 2016-08-17 15:40:39 -04:00
Nate Coraor c3d7ca8eef Revert str.split() syntax for Python 2 compatibility 2016-08-17 14:02:15 -04:00
carlfeberhard bf9a15389e API, history contents: allow 'source' in payload 
In create, checks both kwd and payload for 'source' parameter when
creating a new hdca. This allows source to be passed in the body and
not query string.

This fixes the copy call in history-contents when copying an hdca
by drag and drop in the multi history view.
 2016-08-17 13:08:27 -04:00
Marius van den Beek d1c58f7ab0 Merge pull request #2800 from jmchilton/dbkey_output_without_cond 
[16.04] Fix dbkey problem discovered by @hrhotz
 2016-08-17 09:12:17 +02:00
Dannon Baker 8d512c98e2 Merge branch 'release_16.04' into release_16.07 2016-08-16 16:45:11 -04:00
Björn Grüning 752df7f82b Merge pull request #2788 from dannon/backport_condainstall 
[16.04] Conda explicitly checks for .sh in the command as a part of it's logi…
 2016-08-16 20:41:49 +02:00
John Chilton e06cf9a978 Add None check to fill_template... 
... as requested by @nsoranzo.
 2016-08-16 14:12:17 -04:00