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

..

admin

Remove alert from toolbox reload.

2016-01-03 13:10:55 +00:00

base

Stylize!

2015-12-18 14:42:36 -05:00

common

Unicode fixes for template selection.

2012-08-29 10:49:37 -04:00

search

Fix to 78d0edf9: remove less variable

2015-07-31 15:26:35 -04:00

user

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

webapps

Merge release_15.10 into release_16.01.

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

base.mako

Tours.

2015-12-18 10:26:22 -05:00

display_base.mako

UI, published items: fix css bleeding of trackster.css into other published item displays

2015-12-09 11:55:07 -05:00

display_common.mako

Correct usage of "it's" versus "its".

2014-04-17 15:49:32 -04:00

embed_base.mako

More sanitization related to sharing objects.

2014-12-08 11:11:26 -05:00

export_base.mako

fix shared mako templates that would not work with TS

2015-06-04 10:31:44 -04:00

form.mako

fix shared mako templates that would not work with TS

2015-06-04 10:31:44 -04:00

galaxy_client_app.mako

Webpack: pack scripts, move galaxy-app-base.js to galaxy.js

2015-11-24 16:49:03 -05:00

grid_base_async.mako

Web helpers (${h.*}) in mako used to_json_string, now dumps.

2014-09-08 17:03:22 -04:00

grid_base.mako

UI, History: use copy dialog as import dialog in published history pages, refactor copy-dialog

2015-12-09 19:29:59 -05:00

ind_share_base.mako

Followup to #1109, #1110, add f_any to user API

2015-11-16 20:45:24 -06:00

js-app.mako

Stylize!

2015-12-18 14:42:36 -05:00

message.mako

fix shared mako templates that would not work with TS

2015-06-04 10:31:44 -04:00

no_access.mako

…

page_base.mako

Applied paging to all pages

2015-08-07 13:01:07 -05:00

panels.mako

…

refresh_frames.mako

Webpack: move vendor to libs; break up galaxy.panels to panels and modal; break up galaxy.base to polyfills, galaxy-async, ui/popupmenu, ui/editable-text, and utils/async-save-text; move reset_tool_search into workflow-view; move commatize into trackster/util; move galaxy.autocom_tagging to ui/autocom_tagging

2015-11-06 17:10:52 -05:00

rss.mako

Web helpers (${h.*}) in mako used to_json_string, now dumps.

2014-09-08 17:03:22 -04:00

sharing_base.mako

fix shared mako templates that would not work with TS

2015-06-04 10:31:44 -04:00

show_params.mako

Improve the API attributes on parameters page.

2015-11-15 20:36:12 +00:00

sorting_base.mako

Moved styles to reports.less

2015-07-30 09:18:19 -05:00

spark_base.mako

Fixed bug where max items per page was reset when changing the

2015-08-20 13:52:55 -05:00

tagging_common.mako

Webpack: move vendor to libs; break up galaxy.panels to panels and modal; break up galaxy.base to polyfills, galaxy-async, ui/popupmenu, ui/editable-text, and utils/async-save-text; move reset_tool_search into workflow-view; move commatize into trackster/util; move galaxy.autocom_tagging to ui/autocom_tagging

2015-11-06 17:10:52 -05:00

tool_shed_rating.mako

Rename community template path to tool_shed.

2013-02-26 17:12:52 -05:00