opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-16 07:19:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,553 Commits 63 Branches 243 Tags
dbde38c951cdbb539def102ca55ddf5a4da3ced2
Commit Graph
24553 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dannon Baker dbde38c951 Merge pull request #2872 from remimarenco/patch-9 
Fix typo
 2016-08-29 19:43:46 -04:00
Rémi Marenco 040dd33980 Fix typo 2016-08-29 19:42:10 -04:00
Nate Coraor 4ad0bee552 Merge branch 'release_16.07' into dev 2016-08-26 13:40:03 -04:00
Martin Cech c01ce21e2c Merge pull request #2864 from jmchilton/conda_fixes 
[16.07] Fix three conda bugs.
 2016-08-26 13:19:53 -04:00
John Chilton 6724146e7d Fix three conda bugs. 
- Don't attempt file lock if don't have write access for lock.
- Set disabled to False if conda present and auto_init is False.
- Use the correct parent path for conda_prefix (if default parent path is overridden).
 2016-08-26 12:24:11 -04:00
Dannon Baker 52768c0c42 Merge pull request #2863 from martenson/release_16.07 
[16.07] backport disable conda_auto_init
 2016-08-26 12:23:03 -04:00
Martin Cech d1821fed47 disable conda_auto_init 2016-08-26 12:18:08 -04:00
John Chilton f9758f2871 Merge pull request #2858 from martenson/rn_tweaks 
alter release notes template
 2016-08-25 16:17:19 -04:00
John Chilton 75a3aecbbe Merge pull request #2820 from guerler/charts_revision 
Charts revision, part 2
 2016-08-25 16:00:40 -04:00
Dannon Baker e891c5755f Merge pull request #2859 from martenson/fix-notes-include 
[16.07] fix inclusion of release notes in the announcement
 2016-08-25 15:24:33 -04:00
Martin Cech 53a5b76ff2 Merge pull request #2860 from dannon/postfork-tool-conf-watcher-test-fix 
[16.07] Unused import cleanup for #2856
 2016-08-25 14:53:22 -04:00
Martin Cech c98331eddd Merge pull request #2856 from natefoo/postfork-tool-conf-watcher-test-fix 
[16.07] Postfork tool conf watcher test fix
 2016-08-25 14:43:13 -04:00
Martin Cech 3e65a165b7 fix inclusion of release notes in announcement 2016-08-25 14:32:10 -04:00
Martin Cech 4e5de56b63 alter release notes template 
remove bitbucket distribution
make github commands checkout the actual release instead of master
 2016-08-25 14:09:21 -04:00
Martin Cech d3c696f846 Merge pull request #2857 from jmchilton/release_process_tweaks 
Automate more of the release process...
 2016-08-25 14:04:49 -04:00
Dannon Baker 6631367b7c Unused import, cleanup for #2856 2016-08-25 13:48:58 -04:00
John Chilton 2c866e38d6 Automate more of the release process... 
... this has worked for a couple releases now - time for the computer to push these tags instead of error-prone humans.
 2016-08-25 13:44:30 -04:00
John Chilton a14882f872 Merge branch 'release_16.07' into dev 2016-08-25 13:41:11 -04:00
John Chilton e0aad7af47 Update version to 16.07 v16.07 2016-08-25 13:41:10 -04:00
John Chilton 99fca27270 Merge branch 'release_16.07' into dev 2016-08-25 13:41:04 -04:00
Nate Coraor 4f3c44f3ad Move the registration of the start function into the ToolConfWatcher 
itself so it doesn't have to be called by things that instantiate it.
Fixes #2831.
 2016-08-25 13:23:36 -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
guerler 68a3cb4f43 Fix pie chart config 2016-08-24 18:27:07 -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
guerler 942c59bca4 Fix data labels 2016-08-24 17:27:50 -04:00
guerler a31640c730 Merge branch 'dev' into charts_revision 2016-08-24 17:04:42 -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 7ac7e48ca8 Merge pull request #2794 from bgruening/shorten_conda_envs 
shorten Conda environment names
 2016-08-24 14:01:17 -04:00
John Chilton 57937933fb Merge pull request #2826 from mvdbeek/lock_conda 
Acquire lock before attempting to install conda
 2016-08-24 13:38:17 -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
John Chilton 2a92a7de86 Merge pull request #2830 from nsoranzo/remove_enable_beta_tool_command_isolation 
Remove enable_beta_tool_command_isolation config option
 2016-08-24 13:33:57 -04:00
John Chilton 52e6c9ac30 Merge pull request #2845 from dannon/tabular_dataset_render 
Fix tabular renderer display when total_cols > line_cols > 1
 2016-08-24 13:32:29 -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
Nicola Soranzo 93e74ca51d Merge pull request #2848 from dannon/typo_branch_230981 
Belated typo fixes for 1768
 2016-08-24 10:57:12 +01:00
Dannon Baker eafa71fb8e Belated typo fixes for 1768 2016-08-23 21:40:12 -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
Dannon Baker aa41a70011 Fix tabular renderer display when total_cols > line_cols > 1 2016-08-23 16:07:36 -04:00