Diana Huang ae65bb0332 Merge branch 'master' into feature/diana/rubric-input ...

Conflicts:
	common/lib/capa/capa/inputtypes.py

2013-01-14 13:40:45 -05:00

..

djangoapps

Add property to course module to check if a course is new

2013-01-10 15:57:29 -05:00

lib

Merge branch 'master' into feature/diana/rubric-input

2013-01-14 13:40:45 -05:00

static

Added namespaced RequireJS.

2013-01-03 10:14:06 +02:00

templates

Fix MathJax S3 URL to use the standard HTTPS location

2012-11-30 18:00:45 -05:00

test

clean up lms tests, and fix export/import

2012-12-04 11:52:35 -05:00

xml_cleanup.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00