Nicola Soranzo 3ed60db5ce Merge branch 'release_17.01' into dev ...

Conflicts:
	lib/galaxy/tools/deps/container_resolvers/__init__.py
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map

2017-03-22 01:27:10 +00:00

..

dataset_security

Escape anything that could be user input in mako templates, add markupsafe.escape to username and email in users API controller.

2014-12-10 11:31:21 -05:00

external_service

Escape anything that could be user input in mako templates, add markupsafe.escape to username and email in users API controller.

2014-12-10 11:31:21 -05:00

forms

propagate the commit of 795336f22d8b94b86256b1d4738ee1bf24e18b57 that is already in next-stable to the stable

2014-12-03 13:29:03 -05:00

library

Backed out changeset 48bbe32beefe which introduced a whole bunch of unintended reversions from a broken hg repository

2011-07-06 09:44:56 +10:00

quota

Escape anything that could be user input in mako templates, add markupsafe.escape to username and email in users API controller.

2014-12-10 11:31:21 -05:00

request_type

propagate the commit of 795336f22d8b94b86256b1d4738ee1bf24e18b57 that is already in next-stable to the stable

2014-12-03 13:29:03 -05:00

requests

Remove sample tracking manual external service transfer due to security concerns

2016-02-24 11:18:24 -05:00

tool_shed_repository

Allow display of install_resolver_checkbox when installing data manager tools

2017-03-09 13:40:13 +01:00

tool_version

Add a new grid to view the tool version lineage by tool id (parent/child ordered) for any tool that was ever used in the local Galaxy instance. Tool ids in this grid that are associated with tools currently loaded in the tool panel are highlighted in green and are click-able, displaying the tool. Eliminate the mappers for determining lineage, and use methods instead as the mappers were problematic.

2012-02-06 15:22:56 -05:00

user

Escape anything that could be user input in mako templates, add markupsafe.escape to username and email in users API controller.

2014-12-10 11:31:21 -05:00

impersonate.mako

Committing format changes to the user impersonation dropdown.

2016-07-13 12:18:14 -04:00

jobs.mako

Allow cancelling of upload jobs. This won't cancel the actual upload, but it'll kill (or prevent) the processing job if it exists. This also allows one to clean up 'zombie' upload jobs that never leave 'upload' state via the admin panel.

2015-01-26 16:25:19 -05:00

package_tool.mako

Move ToolSection and ToolSectionLabel out of galaxy.tools directly.

2014-12-31 18:21:10 -05:00

reload_tool.mako

Avoid html response when reloading tool through the api

2017-02-10 22:16:15 -05:00

review_tool_migration_stages.mako

Escape anything that could be user input in mako templates, add markupsafe.escape to username and email in users API controller.

2014-12-10 11:31:21 -05:00

tool_errors.mako

Clarifing naming to use 'Phase'

2015-06-09 11:08:25 -07:00

view_data_tables_registry.mako

Display line errors in data table registry display encountered when loading a location file.

2014-05-13 16:10:27 -04:00

view_datatypes_registry.mako

Escape anything that could be user input in mako templates, add markupsafe.escape to username and email in users API controller.

2014-12-10 11:31:21 -05:00