Bridger Maxwell 4fedca5bf9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading ...

Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py

2012-08-06 16:49:05 -04:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading

2012-08-06 16:49:05 -04:00

lib

Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading

2012-08-06 16:49:05 -04:00

static

Fixed jquery ui image problem and added a base style sheet for lms to override fonts

2012-07-31 11:06:39 -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