Rocky Duan 951fb06341 Merge branch 'master' of github.com:MITx/mitx into merge ...

Conflicts:
	lms/envs/dev.py

2012-08-22 14:04:34 -07:00

..

djangoapps

Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH

2012-08-22 14:43:49 -04:00

lib

Merge pull request #494 from MITx/feature/arjun/course_specific_css

2012-08-22 11:55:20 -07:00

static

Merge branch 'master' of github.com:MITx/mitx into merge

2012-08-22 14:04:34 -07:00

templates

Added MathJax to wiki pages.

2012-08-18 13:12:04 -04:00

test

add a course to test start dates

2012-08-21 16:21:01 -04:00

xml_cleanup.py

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

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