Martin Cech 212f7f4aab Merge branch 'release_16.01' into release_16.04 ...

Conflicts:
	client/galaxy/scripts/mvc/library/library-dataset-view.js
	static/maps/mvc/library/library-dataset-view.js.map
	static/maps/mvc/library/library-folder-view.js.map
	static/maps/mvc/library/library-library-view.js.map
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/library/library-dataset-view.js
	static/scripts/mvc/library/library-folder-view.js
	static/scripts/mvc/library/library-library-view.js

2016-04-19 11:02:44 -04:00

..

gmaj

…

images

Merge pull request #583 from martenson/cleanup-static

2015-08-10 16:35:12 -04:00

jqtouch

…

laj

…

maps

Merge branch 'release_16.01' into release_16.04

2016-04-19 11:02:44 -04:00

patmat

…

scripts

Merge branch 'release_16.01' into release_16.04

2016-04-19 11:02:44 -04:00

style

Merge branch 'lib-refactor-cleanup' into dev

2016-03-30 09:43:19 -04:00

toolshed

add more fields; include category links; some minor bugfixes

2015-06-17 15:09:40 -04:00

wymeditor

…

favicon.ico

new favicon;

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

formatHelp.html

…

incompatible-browser.html

Client: remove IE7/8 and excanvas polyfills

2015-11-24 16:12:31 -05:00

june_2007_style

…

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

Fix link target in welcome

2015-11-01 10:35:13 -05:00