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

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html

2012-08-06 22:38:31 -04:00

..

djangoapps

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

2012-08-06 22:38:31 -04:00

lib

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

2012-08-06 22:38:31 -04:00

static

moved some stuff & ajax link to page

2012-08-03 15:55:21 -04:00

templates

Allow for modular css from XModules, and split capa module css out as a test

2012-07-24 16:14:04 -04:00

test

Formatting and little bugfixes

2012-07-27 16:09:25 -04:00