John Chilton 3dda415fb9 Merge remote-tracking branch 'jmchilton/release_16.01' into release_16.01_merge_4 ...

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

2016-01-11 12:15:14 +00:00

..

bundled

Merge remote-tracking branch 'jmchilton/release_16.01' into release_16.01_merge_4

2016-01-11 12:15:14 +00:00

layout

Re-add identifiers to masthead, new ones for scratchbook (thanks @guerler)

2016-01-05 14:04:22 -05:00

libs

Tours.

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

mvc

Merge remote-tracking branch 'jmchilton/release_16.01' into release_16.01_merge_4

2016-01-11 12:15:14 +00: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

templates/compiled

Webpack: correct handlebars template generation to return an AMD function - this normalizes import of templates between webpack and require, fix sweepster tools import and templates

2015-11-20 12:36:05 -05:00

ui

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

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

utils

Avoid duplicate upload entries, revise modals, add tests

2015-12-19 17:08:49 -05:00

viz

Client: remove IE7/8 and excanvas polyfills

2015-11-24 16:12:31 -05: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

Webpack: correct tool menu template loading in requirejs/galaxy.panels.mako by using require.config.map; normalize galaxy_config.root and Galaxy.options.root to Galaxy.root across the templates and js

2015-11-13 18:05:26 -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

Merge.

2016-01-04 19:23: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