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
24,452 Commits 63 Branches 243 Tags
4e5de56b6341a693d877a6659eac703db67c025e
Commit Graph
24452 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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
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
Dannon Baker 9de06e1594 Merge pull request #1768 from carlfeberhard/api.batch 
Api batch endpoint
 2016-08-23 15:23:22 -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
Dannon Baker b16a9403de Merge pull request #2832 from nsoranzo/fix_for_2805 
Skip whoami check for LDAP servers not supporting it
 2016-08-23 14:10:03 -04: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
Dannon Baker ac3f8b0f5d Merge pull request #2834 from martenson/disable_conda_auto_init 
[16.07] disable conda_auto_init
 2016-08-23 11:26:06 -04:00
Martin Cech a079bc410b Merge pull request #2841 from jmchilton/sync_config_init 
Synchronize and regularize configs of shed & reports
 2016-08-23 11:24:27 -04:00
Dannon Baker 65e8635ef3 Merge pull request #2839 from martenson/adjust_mail_blacklist 
filter disposable mail blacklist on the first domain level only
 2016-08-23 09:52:08 -04:00
John Chilton 55d4f13d75 Synchronize and update documentation for reports and shed. 2016-08-23 09:43:31 -04:00
John Chilton bf43b2735e Remove beaker session options from reports and shed. 
These were removed from Galaxy's config a while ago.
 2016-08-23 09:43:30 -04:00
Martin Cech 56914b2d20 filter mail blacklist on the first domain level 2016-08-22 16:55:29 -04:00
Dannon Baker 49560c5dc0 Merge pull request #2836 from jmchilton/pyuwsgi_fix 
Fix Galaxy for if pyuwsgi is install in .venv.
 2016-08-22 15:44:54 -04:00
John Chilton 0cf4f7277e Fix Galaxy for if pyuwsgi is install in .venv. 2016-08-22 14:33:53 -04: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 a2f0bdbded disable conda_auto_init 2016-08-22 13:34:18 -04:00
Nicola Soranzo 95113b9c84 Skip whoami check for LDAP servers not supporting it 
Fix #2805.
 2016-08-22 17:28:10 +01:00