Nicola Soranzo 0b074f3fa5 Merge branch 'release_17.01' into dev ...

Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map

2017-02-03 11:44:02 +00:00

..

plugins

Merge remote-tracking branch 'jmchilton/dev' into feature/webhooks_tests

2017-01-29 15:40:18 -05:00

auth_conf.xml.sample

Fixes to LDAP auth config sample.

2015-09-04 16:31:07 +01:00

build_sites.yml.sample

Pull build_sites out of datatypes conf.

2017-01-30 20:43:29 -05:00

data_manager_conf.xml.sample

Move samples configs to config subdirectory.

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

datatypes_conf.xml.sample

Pull build_sites out of datatypes conf.

2017-01-30 20:43:29 -05:00

dependency_resolvers_conf.xml.sample

Implement a conda dependency resolver.

2015-12-26 22:46:28 +00: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

Merge branch 'release_17.01' into dev

2017-02-03 11:44:02 +00:00

job_conf.xml.sample_advanced

Add re-submission info to job_conf.xml.sample_advanced.

2017-01-04 16:11:56 -05: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

local_conda_mapping.yml.sample

Samples and defaults for Conda mapping.

2017-01-23 09:47:18 -05: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

more consistent naming.

2016-07-21 13:25:53 -04:00

openid_conf.xml.sample

Move samples configs to config subdirectory.

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

reports.ini.sample

Synchronize and update documentation for reports and shed.

2016-08-23 09:43:31 -04: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

Hide tools that have been replaced.

2016-03-02 11:41:20 -05:00

tool_conf.xml.sample

removed append_collection tool due to John request. MergeCollection should cover all cases that append would have anyway.

2016-08-30 08:55:37 -05:00

tool_data_table_conf.xml.sample

Include all three BLAST .loc files in data table conf

2016-11-04 17:00:13 +00:00

tool_destinations.yml.sample

Updated tool_destinations.yml.sample to include a little more information

2016-07-20 16:04:46 -05:00

tool_shed.ini.sample

Synchronize and update documentation for reports and shed.

2016-08-23 09:43:31 -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