Martin Cech d1c9ffb94c Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev ...

Conflicts:
	client/galaxy/scripts/mvc/tool/tool-form-composite.js
preserved dev version

	static/maps/mvc/tool/tool-form-composite.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/tool/tool-form-composite.js

2017-02-22 10:56:40 -05:00

..

bundled

Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev

2017-02-22 10:56:40 -05:00

layout

Bug fix for masthead webhook if Galaxy.page is undefined for workflow, data libraries etc pages

2016-12-21 12:46:14 +01:00

libs

Merge branch 'dev' into fix_workflow_ui

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

mvc

Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev

2017-02-22 10:56:40 -05:00

nls

Fix bad commit (adding files)

2015-03-17 10:47:31 -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

Merge branch 'dev' into remote_chart_plugins

2016-09-29 22:49:23 -04:00

viz

Custom dbkey builds: additional variable escaping

2017-01-16 10:35:52 +01:00

galaxy.interactive_environments.js

Client build: do not drop console when compressing, when not compressing do not mangle variable names

2015-09-01 10:55:41 -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

fix router returning from dataset permissions back to dataset

2016-02-17 11:56:08 -05: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

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

onload.js

Minor followup to 1846

2016-03-03 12:25:06 -05:00

packed

Fix to ba44452: properly scope mod_icon_btn in define not require

2015-03-31 17:05:50 -04:00

polyfills.js

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

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