Nicola Soranzo ed4e87ecad Merge branch 'release_16.10' into dev ...

Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/bundled/login.bundled.js.map
	static/style/blue/base.css

2016-12-15 11:27:28 +00:00

..

base

UI, history: more minor fixes

2016-06-13 15:53:21 -04:00

citation

UI, citations: fix bad merge from 15.10

2016-04-19 15:35:15 -04:00

collection

Merge remote-tracking branch 'upstream/dev' into history-contents.limiting

2016-07-28 11:58:12 -04:00

dataset

The jobs API, which this functionality is based on, requires a logged in user, so prevent anonymous access here. Also shifts to using Galaxy.root correctly, instead of assuming /

2016-12-14 15:59:18 -05:00

form

Merge branch 'release_16.10' into dev

2016-11-30 15:31:26 +00:00

grid

Fix style of labels in grids

2015-11-04 04:09:10 -05:00

history

Change 'History Actions' to 'Current History' in history options menu.

2016-11-21 14:37:54 -05:00

job

(merge dev)

2015-11-20 10:29:23 -05:00

library

fix the incorrect handling of root when prefix is in play

2016-10-20 20:46:47 -04:00

list

UI, history: render on deleted/hidden toggle

2016-07-28 11:43:44 -04:00

tool

remove unused override

2016-11-18 11:05:28 -05:00

ui

Merge with dev

2016-11-02 21:21:36 +01:00

upload

Escape filename in upload dialog, default and composite. Pointed out by David Wyde.

2016-12-07 07:48:34 -05:00

user

Merge branch 'release_16.10' into dev

2016-12-15 11:27:28 +00:00

visualization

Merge release_16.01 into dev.

2016-01-26 09:06:52 +00:00

workflow

Originating workflow must be unchanged, load save as workflow to editor on save.

2016-10-18 16:06:16 -05:00

annotation.js

UI, history: correct current dataset, tags, annos

2016-04-04 11:12:54 -04:00

base-mvc.js

UI, history: minor cleanup

2016-03-21 10:40:13 -04:00

tag.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

tours.js

Use real routes for tours, and make them actually work. Now it's

2016-03-04 16:23:58 -05:00

webhooks.js

- remove separate functions for adding masthead/history-menu plugins

2016-10-12 10:49:41 +02:00