Nate Coraor 656d9bef50 Merge remote-tracking branch 'upstream/release_15.05' into dev ...

Conflicts:
	lib/galaxy/version.py

2015-05-14 11:11:46 -04:00

..

libs

Client libs: update d3 from 3.4.8 to 3.5.5

2015-05-07 13:16:38 -04:00

mvc

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

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

nls

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

rgenetics

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

templates/compiled

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

tools/rgenetics

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

ui

UI, List creator: move hoverhighlight to its own module

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

utils

Accept 'None' as valid value

2015-05-13 11:24:32 -04:00

viz

Merge circster fix from release_15.03 to dev

2015-03-31 17:39:48 -04:00

base.js.map

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

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

2015-04-16 16:01:23 -04:00

galaxy.autocom_tagging.js.map

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

galaxy.base.js.map

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

galaxy.frame.js.map

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

galaxy.interactive_environments.js.map

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

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

galaxy.masthead.js.map

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

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

galaxy.pages.js.map

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

galaxy.panels.js.map

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

galaxy.tools.js.map

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

galaxy.ui.scrollPanel.js.map

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

galaxy.workflow_editor.canvas.js.map

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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

galaxy.workflows.js.map

Merge to dev

2015-03-17 10:56:40 -04:00

i18n.js.map

Client build: use uglify for compression adding static/maps for source maps and static/src as a symlink to serve the uncompressed files

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