Calen Pennington 8575ed439d Merge branch 'master' into dogfood ...

Conflicts:
	djangoapps/courseware/capa/responsetypes.py
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/html_module.py
	djangoapps/courseware/modules/seq_module.py
	djangoapps/courseware/modules/x_module.py
	djangoapps/courseware/views.py
	templates/main.html
	templates/problem.js
	templates/textbox.html

2012-06-05 14:38:49 -04:00

..

admin

add django admin interface files to static

2012-05-29 07:35:21 -04:00

coffee

Merge branch 'master' into pmitros/dexml

2012-06-01 16:00:48 -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

css

add codemirror.css back ; it is in static/css for now, until pipeline/coffee fixed.

2012-05-26 22:37:47 -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

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -04:00

sass

Fix problem with sequence navigation on iOS

2012-06-01 12:06:31 -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

green-pointer.png

green pointer image for imageinput

2012-05-29 17:08:12 -04:00

pixel.jpg

Move to subdirectory in preparation for merge

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