David Ormsbee 66ffef131d Merge branch 'master' into cale/circular-import-fix ...

Conflicts:
	common/djangoapps/student/models.py

2013-01-15 11:35:19 -05:00

..

djangoapps

Merge branch 'master' into cale/circular-import-fix

2013-01-15 11:35:19 -05:00

lib

removed on event from slider and readonly from textbox

2013-01-15 13:34:16 +02:00

static

GST work in progress.

2013-01-15 12:55:13 +02:00

templates

Fix MathJax S3 URL to use the standard HTTPS location

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

test

added gst tests for import

2013-01-15 12:55:20 +02:00

xml_cleanup.py

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

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