Nicola Soranzo ed4e87ecad Merge branch 'release_16.10' into dev ...

Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/bundled/login.bundled.js.map
	static/style/blue/base.css

2016-12-15 11:27:28 +00:00

..

layout

repack client

2016-11-30 12:10:23 -05:00

libs

Bring data provided by data manager in line with Trackster's bigwig datatype. Also allow LinePainter to draw regions of variable length.

2016-08-23 16:55:20 -04:00

mvc

Merge branch 'release_16.10' into dev

2016-12-15 11:27:28 +00:00

nls

…

reports_webapp

…

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

UI, history: search and ui/search-input

2016-07-05 12:16:19 -04:00

utils

Merge branch 'dev' into remote_chart_plugins

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

viz

Cleanup: (a) remove debugging statements; (b) use Galaxy app; and (c) fix offset issue for LinePainter using floor instead of ceil.

2016-08-31 14:22:36 -04:00

galaxy-app-base.js.map

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

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

galaxy.interactive_environments.js.map

…

galaxy.js.map

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

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

galaxy.library.js.map

fix router returning from dataset permissions back to dataset

2016-02-17 11:56:08 -05:00

galaxy.menu.js.map

Tours.

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

galaxy.pages.js.map

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.map

…

onload.js.map

Minor followup to 1846

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

polyfills.js.map

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

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

toolshed.groups.js.map

…