Nicola Soranzo ef3e63e6d7 Merge branch 'release_16.07' 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

2016-11-02 10:40:04 +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

Fix tabular renderer display when total_cols > line_cols > 1

2016-08-23 16:07:36 -04:00

form

Generalize group forms

2016-08-21 18:29:19 -04:00

grid

Fix style of labels in grids

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

history

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

2016-10-12 10:49:41 +02: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

Reapply isolated tool-form.js webhook changes

2016-10-27 12:50:02 +02:00

ui

Hide tab navbar if there is only one tab available

2016-10-27 13:30:39 -04:00

upload

Use listenTo for collection events

2016-08-03 13:05:29 -04:00

user

UI: use strict and replace leaky uses of Backbone.Events.on with listenTo

2016-01-12 15:18:54 -05: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