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

..

gmaj

…

images

include new logo in the new release

2015-04-29 14:43:06 -04:00

jqtouch

remove misc files that slipped past hgignore

2014-04-10 22:54:34 -05:00

laj

…

maps

Merge remote-tracking branch 'upstream/release_15.05' into dev

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

patmat

…

scripts

Merge remote-tracking branch 'upstream/release_15.05' into dev

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

style

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

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

wymeditor

…

favicon.ico

new favicon;

2015-05-04 09:59:09 -04:00

formatHelp.html

updates to Phenotype Association tools from Belinda

2012-11-20 11:42:13 -05:00

help.css

…

help.html

…

help.rst

…

june_2007_style

style: correct symbolic link

2013-02-08 14:55:33 -05:00

robots.txt

…

src

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

user_disabled.html

…

welcome.html.sample

nicer wording

2015-04-30 14:02:33 -04:00

welcome.rst

Updated default text at bottom of welcome page that comes up when you first launch your own Galaxy.

2013-01-10 14:01:02 -08:00