Nicola Soranzo d807ed0f75 Merge branch 'release_17.05' 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

2017-06-02 15:05:14 +01:00

..

base

Strip stashed-yet-merged debug detritus from history UI fixes.

2017-02-20 17:16:27 -05:00

citation

Update wiki.galaxyproject.org links in client

2017-04-26 17:02:46 -04:00

collection

Repack client.

2017-05-01 21:20:36 -04:00

dataset

Sort tags for display (note, this is stupid to have in 3 places -- refactor)

2017-06-01 10:38:13 -04:00

form

Add uploader element

2017-03-16 22:52:03 -04:00

grid

Fix global grid action events

2017-05-15 14:21:17 -04:00

history

Sort tags for display (note, this is stupid to have in 3 places -- refactor)

2017-06-01 10:38:13 -04:00

job

(merge dev)

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

library

Merge branch 'wiki-to-hub' into dev

2017-04-28 16:29:30 +01:00

list

UI, history: render on deleted/hidden toggle

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

tool

Handle potential regex expression in workflow parameter names

2017-05-31 16:28:18 -04:00

toolshed

repack client (seems to not be done in a while)

2017-03-21 09:53:51 -04:00

ui

Make client

2017-05-11 14:26:45 -04:00

upload

[17.05] Fix FTP upload of multiple files in collection uploader.

2017-05-11 15:37:50 -04:00

user

Merge remote-tracking branch 'upstream/dev' into wiki-to-hub

2017-04-26 17:09:40 -04:00

visualization

Merge release_16.01 into dev.

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

workflow

Improved styling of workflow list. Removed unused class, used hierarchy in base.less.

2017-06-01 09:48:44 -04: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

Slight refactoring, also name->hash for recommended tags.

2017-04-26 14:53:07 -04:00

tours.js

Merge branch 'dev' into admin_app

2017-05-15 16:53:23 -04:00

webhooks.js

Fix incorrect merge.

2017-03-06 10:08:20 -05:00