guerler c1bf66b9b0 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_validation ...

Conflicts:
	lib/galaxy/tools/__init__.py
	static/maps/mvc/form/form-view.js.map
	static/scripts/mvc/form/form-view.js

2015-04-10 19:59:56 -04:00

..

libs

Strip out unused lunr dependency -- a different approach was pursued for tool searching.

2015-04-01 11:41:15 -04:00

mvc

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

2015-04-10 19:59:56 -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

Fix bad commit (adding files)

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

tools/rgenetics

Fix bad commit (adding files)

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

ui

Fix bad commit (adding files)

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

utils

Client: do not remove console statements when compressing; UI, Collections: propagate hasUser to collection panels, style fixes

2015-03-18 09:30:18 -04:00

viz

Merge circster fix from release_15.03 to dev

2015-03-31 17:39:48 -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

Fix bad commit (adding files)

2015-03-17 10:47:31 -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: do not remove console statements when compressing; UI, Collections: propagate hasUser to collection panels, style fixes

2015-03-18 09:30:18 -04:00

galaxy.library.js

Fix bad commit (adding files)

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

galaxy.masthead.js

Fix bad commit (adding files)

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

Fix bad commit (adding files)

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

galaxy.ui.scrollPanel.js

Fix bad commit (adding files)

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

galaxy.workflow_editor.canvas.js

Fix bad commit (adding files)

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

galaxy.workflows.js

Merge to dev

2015-03-17 10:56:40 -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