Carl Eberhard ff13fb85cc Merge conflicts

2015-08-07 14:14:49 -04:00

..

libs

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

2015-08-04 13:07:08 -05:00

mvc

Merge conflicts

2015-08-07 14:14:49 -04:00

nls

Fix bad commit (adding files)

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

Merge pull request #526 from carlfeberhard/trackster.existing-browser

2015-08-05 20:50:18 +01:00

viz

Visualizations, trackster: allow the user to add the dataset launched from as a new track in an existing trackster visualization; add utils/query-string-parsing.js for pulling query params from the query string

2015-07-29 13:57:34 -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

UI, Histories: improve highlighting of current/active content in current history panel

2015-04-16 16:01:23 -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

fix path to spinner icon, grunting

2015-06-02 15:58:24 +02: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 bad commit (adding files)

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

galaxy.pages.js

Fix bad commit (adding files)

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

galaxy.panels.js

Fix bad commit (adding files)

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