John Chilton f8a7ac0820 Merge release_15.10 into release_16.01. ...

Conflicts:
	eggs.ini
	lib/galaxy/tools/__init__.py
	lib/galaxy/tools/actions/__init__.py
	lib/galaxy/tools/toolbox/base.py
	static/maps/mvc/collection/list-collection-creator.js.map
	static/maps/mvc/library/library-foldertoolbar-view.js.map
	static/maps/utils/uploadbox.js.map
	static/scripts/mvc/collection/list-collection-creator.js
	static/scripts/mvc/library/library-foldertoolbar-view.js
	static/scripts/utils/uploadbox.js
	test/base/twilltestcase.py
	test/functional/tools/samples_tool_conf.xml

2016-01-08 18:06:28 +00:00

..

collection-li-edit.js

UI, Collections: allow expansion to fetch details for DatasetDCEs (assuming they're HDAs); move rerunnable and creating_job fetch to HDAs

2015-10-06 09:49:16 -04:00

collection-li.js

UI, Collections: allow expansion to fetch details for DatasetDCEs (assuming they're HDAs); move rerunnable and creating_job fetch to HDAs

2015-10-06 09:49:16 -04:00

collection-model.js

Webpack: correct tool menu template loading in requirejs/galaxy.panels.mako by using require.config.map; normalize galaxy_config.root and Galaxy.options.root to Galaxy.root across the templates and js

2015-11-13 18:05:26 -05:00

collection-view-edit.js

Webpack: correct tool menu template loading in requirejs/galaxy.panels.mako by using require.config.map; normalize galaxy_config.root and Galaxy.options.root to Galaxy.root across the templates and js

2015-11-13 18:05:26 -05:00

collection-view.js

Webpack: normalize list-panel to list-view

2015-11-13 16:05:52 -05:00

list-collection-creator.js

Merge release_15.10 into release_16.01.

2016-01-08 18:06:28 +00:00

list-of-pairs-collection-creator.js

UI, list of pairs collection creator: improve auto-pair error message to be more beginner friendly(?)

2015-12-14 09:20:10 -05:00

pair-collection-creator.js

Merge and rebuild client

2015-11-19 20:34:32 -05:00