Calen Pennington 8a89309338 Merge branch 'master' into asset-pipeline ...

Conflicts:
	static/js/application.js

2012-05-21 14:53:16 -04:00

..

coffee

Merge branch 'master' into asset-pipeline

2012-05-21 14:53:16 -04:00

contrib

Move to subdirectory in preparation for merge

2012-03-19 11:10:43 -04:00

courses

Fix up the symlinks to point to the right place

2012-03-19 11:10:44 -04:00

fonts

Move to subdirectory in preparation for merge

2012-03-19 11:10:43 -04:00

images

Make collectstatic compile .coffee files, and preserve the askbot workflow using guard

2012-05-18 15:10:10 -04:00

js

Adds ARIA labels to page elements

2012-05-21 11:23:55 -04:00

sass

Don't pipeline in dev environment, which means that there is no need to run collectstatic either. Hooray\!

2012-05-18 15:37:57 -04:00

staff

Move to subdirectory in preparation for merge

2012-03-19 11:10:43 -04:00

.gitignore

Move to subdirectory in preparation for merge

2012-03-19 11:10:43 -04:00

.hgignore

Move to subdirectory in preparation for merge

2012-03-19 11:10:43 -04:00

pixel.jpg

Move to subdirectory in preparation for merge

2012-03-19 11:10:43 -04:00