John Chilton aee38feeb4 Merge remote-tracking branch 'galaxyproject/dev' into gie-generic ...

Conflicts:
	static/maps/layout/menu.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/layout/menu.js

2016-04-04 13:00:21 -04:00

..

bundled

Merge remote-tracking branch 'galaxyproject/dev' into gie-generic

2016-04-04 13:00:21 -04:00

layout

Merge remote-tracking branch 'galaxyproject/dev' into gie-generic

2016-04-04 13:00:21 -04:00

libs

Merge release_16.01 into dev.

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

mvc

Merge branch 'lib-refactor-cleanup' into dev

2016-03-30 09:43:19 -04: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

Webpack: move data.js into dataset/data.js; pack scripts

2015-11-12 14:52:11 -05:00

utils

Add workflow content selectors and test cases

2016-03-27 16:18:29 -04:00

viz

The response from dataproviders here can return data===null in addition to being simply undefined. This corrects the logic shortcutting and prevents errors like 'Cannot read property 'min' of null'

2016-03-25 10:37:28 -04: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