guerler 823fd4ae47 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into ui_revision_000 ...

Conflicts:
	static/style/blue/base.css

2015-09-04 12:28:56 -04:00

..

plugins

Merge pull request #462 from scholtalbers/dev

2015-08-09 23:44:26 +01:00

auth_conf.xml.sample

Fixes to LDAP auth config sample.

2015-09-04 16:31:07 +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

One more bump to be the last tabular type detected, since ConnectivityTable is more specific.

2015-08-06 17:19:12 -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

Remove tool form downgrade option

2015-08-18 13:54:52 -04:00

job_conf.xml.sample_advanced

Add example and test case for job configuration expansion.

2015-06-22 13:09:23 -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 extra_dir options for S3/Swift ObjectStore.

2015-06-15 09:17:59 +00: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

Remove biomart_test tool, http://test.biomart.org/ is down.

2015-04-29 12:04:32 +01:00

tool_data_table_conf.xml.sample

liftOver.loc was not accessible from local data

2015-08-11 10:58:06 +02:00

tool_shed.ini.sample

make field boosts for TS search configurable

2015-06-19 17:25:53 -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