Martin Cech 10c915bb62 Merge branch 'dev' into data-lib-work ...

Conflicts:
	static/maps/mvc/library/library-foldertoolbar-view.js.map
	static/scripts/mvc/library/library-foldertoolbar-view.js

also re-grunted

2015-09-28 11:40:35 -04:00

..

libs

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

2015-09-01 10:55:41 -04:00

mvc

Merge branch 'dev' into data-lib-work

2015-09-28 11:40:35 -04:00

nls

Fix bad commit (adding files)

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

reports_webapp

Refactored where d3 is coming from

2015-08-20 14:49:09 -05:00

rgenetics

Fix bad commit (adding files)

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

templates/compiled

Client build: transition to grunt based handlebars compilation and minify/map them to static/scripts; cleanup: remove py script, remove uncompiled from minified

2015-07-21 14:56:07 -04:00

tools/rgenetics

Fix bad commit (adding files)

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

ui

UI, List creator: move hoverhighlight to its own module

2015-04-14 10:29:22 -04:00

utils

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

2015-09-01 10:55:41 -04:00

viz

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

2015-09-01 10:55:41 -04:00

base.js

Client: fix to base.js to remove Backbone dependency until we stop loading it via script tag (this should fix a trackster load error where backbone was attempting to reload jquery without a shim)

2015-03-23 18:53:40 -04:00

galaxy-app-base.js

First pass of updating rerun to use the new modal. Pretty hacky, needs cleanup.

2015-09-16 11:52:38 -04:00

galaxy.autocom_tagging.js

Fix bad commit (adding files)

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

galaxy.base.js

Fix bad commit (adding files)

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

galaxy.frame.js

Fix bad commit (adding files)

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

Fix bad commit (adding files)

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

galaxy.masthead.js

add a margin to the logo picture to match the space in front of text

2015-04-29 15:40:29 -04:00

galaxy.menu.js

Fix user object usage

2015-09-04 16:59:20 -04:00

galaxy.pages.js

Fix bad commit (adding files)

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

galaxy.panels.js

Note root in Galaxy object

2015-09-01 09:24:55 -04:00

galaxy.tools.js

Undo merged fixed, replace underscore path rewrite

2015-06-24 12:33:17 -04:00

galaxy.ui.scrollPanel.js

Fix bad commit (adding files)

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

galaxy.workflows.js

Fix generic forms for modules

2015-06-10 03:13:38 -04:00

i18n.js

Fix bad commit (adding files)

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

packed

Fix to ba44452: properly scope mod_icon_btn in define not require

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