Nate Coraor 049e9e8024 Merge remote-tracking branch 'upstream/release_15.03' into release_15.05 ...

Conflicts:
	config/plugins/interactive_environments/ipython/config/ipython.ini.sample

2015-05-07 11:57:59 -04:00

..

plugins

Merge remote-tracking branch 'upstream/release_15.03' into release_15.05

2015-05-07 11:57:59 -04:00

auth_conf.xml.sample

Filter also on username in AuthManager.active_authenticators().

2015-05-06 11:39:43 +01:00

data_manager_conf.xml.sample

Move samples configs to config subdirectory.

2014-09-15 11:28:18 -04:00

datatypes_conf.xml.sample

Checkout proper branch...

2015-04-06 15:01:04 -04:00

disposable_email_blacklist.conf.sample

initial commit of email activation feature

2013-09-19 16:38:12 -04:00

external_service_types_conf.xml.sample

Move samples configs to config subdirectory.

2014-09-15 11:28:18 -04:00

galaxy.ini.sample

Fix some minor typos in comment docs in config/galaxy.ini.sample.

2015-05-04 12:15:56 -04:00

job_conf.xml.sample_advanced

Merge branch 'release_15.03' into dev

2015-04-08 16:13:10 -04:00

job_conf.xml.sample_basic

Move samples configs to config subdirectory.

2014-09-15 11:28:18 -04:00

job_metrics_conf.xml.sample

Move samples configs to config subdirectory.

2014-09-15 11:28:18 -04:00

job_resource_params_conf.xml.sample

Move samples configs to config subdirectory.

2014-09-15 11:28:18 -04:00

migrated_tools_conf.xml.sample

Move samples configs to config subdirectory.

2014-09-15 11:28:18 -04:00

object_store_conf.xml.sample

Add more accurate sample for specifying a swift object store in object_store_conf.sample

2015-02-10 09:55:03 -05:00

openid_conf.xml.sample

Move samples configs to config subdirectory.

2014-09-15 11:28:18 -04:00

reports_wsgi.ini.sample

Sync report options with galaxy.ini. This will only improve documentation and has no effect on the default settings.

2015-03-06 21:05:14 +01:00

shed_data_manager_conf.xml.sample

Move samples configs to config subdirectory.

2014-09-15 11:28:18 -04:00

shed_tool_conf.xml.sample

Move samples configs to config subdirectory.

2014-09-15 11:28:18 -04:00

shed_tool_data_table_conf.xml.sample

Move samples configs to config subdirectory.

2014-09-15 11:28:18 -04:00

tool_conf.xml.main

Add ZebrafishMine Data Source Tool.

2015-01-21 14:56:08 -05:00

tool_conf.xml.sample

Add ZebrafishMine Data Source Tool.

2015-01-21 14:56:08 -05:00

tool_data_table_conf.xml.sample

Have IGV external display application load a set of links for available genomes via a tool data table that reads a URL (http://igv.broadinstitute.org/genomes/genomes.txt). The manually specified builds links should now be used to add additional builds, or for alias mapping (e.g. hg_g1k_v37-->b37).

2015-02-27 15:50:28 -05:00

tool_shed.ini.sample

comment out defaults

2015-04-21 13:56:56 -04:00

tool_sheds_conf.xml.sample

comment out connection to TTS in sample config

2015-03-24 16:08:21 -04:00

workflow_schedulers_conf.xml.sample

Implement workflow scheduling 'plugin' framework.

2014-11-13 13:47:38 -05:00