Nicola Soranzo f4941e5422 Merge branch 'release_17.09' into dev ...

Conflicts:
	static/scripts/bundled/admin.bundled.js
	static/scripts/bundled/admin.bundled.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map

2017-09-28 16:52:46 +01:00

..

app

Merge branch 'tags_in_history' into dev

2017-03-06 13:27:44 -05:00

layout

Use standard naming for Utils import.

2017-09-11 10:35:59 -04:00

libs

Merge branch 'dev' into fix_workflow_ui

2017-01-24 13:15:00 -05:00

mvc

Merge branch 'release_17.09' into dev

2017-09-28 16:52:46 +01:00

nls

Updating the dataset id

2017-07-31 16:46:50 +02:00

reports_webapp

Run make client.

2017-08-16 15:27:26 +01:00

templates/compiled

…

ui

Run make client.

2017-08-16 15:27:26 +01:00

utils

Minor refactor, use a single Utils.setWindowTitle() method.

2017-09-11 10:32:55 -04:00

viz

Run make client.

2017-08-16 15:27:26 +01:00

admin.toolshed.js.map

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

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

analysis.js.map

Merge branch 'tags_in_history' into dev

2017-03-06 13:27:44 -05:00

app.js.map

Merge branch 'tags_in_history' into dev

2017-03-06 13:27:44 -05:00

galaxy-app-base.js.map

…

galaxy.interactive_environments.js.map

Re-enable keepalive, build client.

2017-09-27 07:54:27 -04:00

galaxy.js.map

Merge branch 'dev' into revise_page

2017-08-09 12:32:30 -04:00

galaxy.library.js.map

adjust logic to match the include deleted checkbox

2017-06-27 10:41:22 +02:00

galaxy.menu.js.map

…

galaxy.pages.js.map

Run make client.

2017-08-16 15:27:26 +01:00

i18n.js.map

…

onload.js.map

Fix onload webhook call w/ Galaxy.root

2017-09-27 11:51:38 -04:00

polyfills.js.map

…

toolshed.groups.js.map

…