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

2012-12-19 13:17:10 -05:00

..

djangoapps

Merge pull request #1094 from MITx/feature/victor/instructor-grading

2012-12-07 08:44:58 -08:00

lib

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

2012-12-19 13:17:10 -05:00

static

Add HD control to video player

2012-10-30 19:21:17 -04: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