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

Conflicts:
	static/style/blue/base.css
	test/functional/tools/sample_datatypes_conf.xml

2017-07-05 16:19:10 +01:00

..

app

Merge branch 'tags_in_history' into dev

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

bundled

Merge branch 'release_17.05' into dev

2017-07-05 16:19:10 +01:00

layout

code optimization - reuse userTab variable

2017-07-04 09:01:10 +02:00

libs

Merge branch 'dev' into fix_workflow_ui

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

mvc

Merge remote-tracking branch 'guerler/fix_shared_history' into dev

2017-07-03 20:46:42 -04:00

nls

Rebuild to provide new localization.

2017-05-18 12:05:03 -04:00

reports_webapp

remove the autorefresh on Reports app

2015-10-21 14:22:41 -04:00

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

Merging with dev

2017-06-21 17:26:48 +02:00

viz

Update wiki.galaxyproject.org links in client

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

admin.toolshed.js

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

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

analysis.js

Merge branch 'tags_in_history' into dev

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

app.js

Merge branch 'tags_in_history' into dev

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

galaxy.interactive_environments.js

Error handling for GIE container readiness check

2017-04-17 16:51:35 -04:00

galaxy.js

Webpack: pack scripts, move galaxy-app-base.js to galaxy.js

2015-11-24 16:49:03 -05:00

galaxy.library.js

adjust logic to match the include deleted checkbox

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

galaxy.menu.js

Tours.

2015-12-18 10:26:22 -05:00

galaxy.pages.js

Webpack: move vendor to libs; break up galaxy.panels to panels and modal; break up galaxy.base to polyfills, galaxy-async, ui/popupmenu, ui/editable-text, and utils/async-save-text; move reset_tool_search into workflow-view; move commatize into trackster/util; move galaxy.autocom_tagging to ui/autocom_tagging

2015-11-06 17:10:52 -05:00

i18n.js

…

onload.js

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

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

packed

…

polyfills.js

Client, polyfills: check for sessionStorage using a more cross-browser (apparently) way

2015-12-09 14:10:36 -05:00