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

Fix some merge issues involving rubric rendering

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py

2013-01-18 16:36:22 -05:00

..

djangoapps

Sort courses announcement date

2013-01-17 21:46:58 -05:00

lib

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

2013-01-18 16:36:22 -05: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

disable export of testcenter_exam from course module (and add test).

2013-01-15 17:54:10 -05:00

xml_cleanup.py

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

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