Nicola Soranzo 9cbabef17e Merge branch 'release_17.05' into dev ...

Conflicts:
	static/maps/mvc/library/library-foldertoolbar-view.js.map
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/library/library-foldertoolbar-view.js

2017-08-14 12:07:17 +01:00

..

app

Merge branch 'tags_in_history' into dev

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

layout

Merge branch 'dev' into revise_page

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

libs

Merge branch 'dev' into fix_workflow_ui

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

mvc

Merge branch 'release_17.05' into dev

2017-08-14 12:07:17 +01:00

nls

Updating the dataset id

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

reports_webapp

…

templates/compiled

…

ui

Rename custom autocomplete module to avoid interference with original jquery autocomplete, use original version to display datalists

2017-01-11 10:44:45 -05:00

utils

Fix message handling in user preference main view

2017-08-07 22:22:03 -04:00

viz

Adjust existing urls to new client side route

2017-07-13 08:55:01 -04: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

Error handling for GIE container readiness check

2017-04-17 16:51:35 -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

Remove change to original handler function

2017-07-07 11:01:36 -04:00

i18n.js.map

…

onload.js.map

Remove global Toastr addition, allow external requires through standard js-app entrypoint.

2017-05-05 12:08:01 -04:00

polyfills.js.map

…

toolshed.groups.js.map

…