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
35,045 Commits 62 Branches 243 Tags
4cdd210bb27cd1c271e69c8dfd46585f0c232ef9
Commit Graph
595 Commits
Author SHA1 Message Date
Martin Cech a37b638491 Merge pull request #5390 from natefoo/framework-dependencies-doc-update 
[18.01] Update framework dependencies documentation
 2018-02-01 15:00:15 -05:00
Evgeny Anatskiy 29c766167a update webhooks docs 2018-02-01 12:22:21 -05:00
Nicola Soranzo da002bdf44 Merge branch 'release_18.01' into dev 2018-01-31 11:46:53 +00:00
Nicola Soranzo 5b23c0e87d Merge branch 'release_17.09' into release_18.01 
Conflicts:
	client/galaxy/scripts/mvc/workflow/workflow-node.js
	config/galaxy.ini.sample
	static/maps/mvc/workflow/workflow-node.js.map
	static/scripts/mvc/workflow/workflow-node.js
 2018-01-31 10:38:53 +00:00
Nicola Soranzo c0c95548a3 Merge branch 'release_17.05' into release_17.09 2018-01-31 10:16:33 +00:00
mvdbeek a70f2875b3 Remove r channel from more locations 2018-01-29 18:07:29 +01:00
Nate Coraor 6333e83a65 Doc corrections from @nsoranzo 2018-01-26 10:18:53 -05:00
Nate Coraor fd96864bd6 Finish updates to framework dependencies doc 2018-01-25 12:36:11 -05:00
Nate Coraor 6bdd755aaf WIP framework dependencies doc update 2018-01-25 12:36:11 -05:00
Nicola Soranzo e87d1aa79d More Python3 print function fixes 2018-01-25 11:52:11 +01:00
Nate Coraor 3cc1b25c18 Fix make docs when the virtualenv is not .venv 2018-01-24 12:50:22 -05:00
Nate Coraor ebafd19575 Merge pull request #5138 from scholtalbers/feature/auto_create_userfolder 
Add option to auto create user_library_import_dir directories upon user login
 2018-01-22 11:27:19 -05:00
Nate Coraor dea3b73dd2 Merge remote-tracking branch 'origin/dev' into feature/populate_ldap_user 2018-01-19 11:45:33 -05:00
Nate Coraor ea7dbd1906 Merge remote-tracking branch 'origin/dev' into feature/auto_create_userfolder 2018-01-19 11:39:30 -05:00
Anthony Bretaudeau 3f2f5e6af4 doc/schema 2018-01-19 12:39:50 +01:00
Nate Coraor 3fdbaa3dec Regenerate galaxy.yml.sample and documentation for newly 
added/documented config options.
 2018-01-18 12:31:41 -05:00
Nate Coraor 44c291bc66 Merge remote-tracking branch 'origin/dev' into ini_to_yaml_config 2018-01-18 12:30:05 -05:00
Nate Coraor d238b0f25b Fix linting error and avoid double import 2018-01-18 12:08:24 -05:00
Nate Coraor 4bdebe0186 Conditional fixes for the documentation message box 2018-01-18 11:15:30 -05:00
Nate Coraor 98e369c9a7 Use $TARGET_GIT_BRANCH instead of $GIT_BRANCH (which is a lie for matrix 
configs)
 2018-01-18 11:03:54 -05:00
Nate Coraor 59c6d6957e Fix string slicing error 2018-01-18 10:38:23 -05:00
Nate Coraor 141ac1eabc Move simpleversioning config to a separate file that can be written to 
conf.py by Jenkins
 2018-01-18 10:00:56 -05:00
Nate Coraor 8ecddefd09 WIP for linking doc versions 2018-01-17 17:04:13 -05:00
Nate Coraor efb061d4d4 Add a tiny bit about uwsgitop 2018-01-12 16:51:37 -05:00
Nate Coraor 5fcefe404f Attempt to reduce duplication in the proxy documentation through the use 
of includes, move the multi-config-file discussion to a common page.
 2018-01-12 16:44:40 -05:00
Nate Coraor f4131b8d2b Correct doc typos caught by @nsoranzo 2018-01-12 10:45:50 -05:00
Nate Coraor 78992968ec Correct documentation line endings 2018-01-11 16:40:05 -05:00
Nate Coraor 5a0d60537c Update Apache documentation for uWSGI 2018-01-11 16:38:48 -05:00
Nate Coraor 1b583fb851 Update nginx documentation for uWSGI 2018-01-11 13:56:23 -05:00
Nate Coraor 35b1e2c9e7 Correct the handlers section of the job conf documentation. 2018-01-10 16:47:09 -05:00
Nate Coraor 1e275e84f8 Add loggging configuration to admin docs TOC and move the cluster docs 
after the scaling docs
 2018-01-10 16:28:00 -05:00
Nate Coraor db00f97175 Finish Galaxy logging configuration documentation 2018-01-10 16:26:09 -05:00
Nate Coraor e0891cac35 Add intersphinx mapping to the Python 2.7 documentation 2018-01-10 16:25:26 -05:00
Nate Coraor 9204916ac8 Galaxy config doc corrections 2018-01-10 16:23:54 -05:00
Nate Coraor 18b3599207 Remove emperor mode reference 2018-01-10 16:20:11 -05:00
selten f1f6a19a0f #5291 Changed text, removed Admin/GetGalaxy 2018-01-10 18:15:17 +01:00
selten 15bc610cf0 #5291 fix link to HTTP getgalaxy.org 2018-01-10 18:12:32 +01:00
Nate Coraor 36ecca47e7 Major updates to the scaling doc for uWSGI 2018-01-09 18:21:22 -05:00
Dannon Baker 70941cc57b Update api quickstart doc to use default port, with a little bit of extra guidance. 2018-01-03 12:18:04 -05:00
John Chilton 9c77936515 Adjust note about nginx enabled sites configuration 
Originally implemented by @scholtalbers in https://github.com/galaxyproject/galaxy-hub/pull/355.
 2018-01-03 10:37:04 -05:00
Nicola Soranzo 6d3eadedbd Merge pull request #5227 from jmchilton/merge_1709 
Merge 17.09.
 2017-12-15 18:14:34 +00:00
John Chilton 90ba35a9a4 Merge remote-tracking branch 'jmchilton/release_17.09' into merge_1709 2017-12-15 12:02:07 -05:00
Nicola Soranzo 18221ae931 paster.pid/log to galaxy.pid/log reference update 
Fix errors in `first_startup` jobs:
https://travis-ci.org/galaxyproject/galaxy/jobs/316342622#L1029

Introduced in https://github.com/galaxyproject/galaxy/pull/4475
 2017-12-15 15:34:47 +00:00
Nate Coraor 8cf649b331 WIP admin docs updates for 18.01 2017-12-07 16:47:52 -05:00
Nate Coraor 0664921e00 WIP admin documentation updates 2017-12-07 11:28:41 -05:00
John Chilton 0585efaaa7 Update newer deployer config docs for switch to YAML config. 2017-12-06 20:57:09 -05:00
John Chilton c99b4ece5b [17.09] Deployer doc fixes. 2017-12-06 20:28:41 -05:00
John Chilton cec42d1656 yaml_config - Update Conda FAQ to link out to last .ini variant of docs for those who need them. 2017-12-06 20:28:21 -05:00
John Chilton ba35d474a0 yaml_config - update admin docs for switch to YAML config. 2017-12-06 20:28:20 -05:00
John Chilton 4f4928b386 yaml_config - Add RST docs for Galaxy options. 
Automatically generated from the new specification.
 2017-12-06 20:28:20 -05:00