Calen Pennington 80b8529f2f Merge branch 'hotfix/1.0.4' ...

Conflicts:
	common/djangoapps/util/middleware.py

2012-08-08 11:05:26 -04:00

..

djangoapps

Merge branch 'hotfix/1.0.4'

2012-08-08 11:05:26 -04:00

lib

Merge pull request #349 from MITx/feature/kfiedler/courseware-style

2012-08-07 10:20:10 -07: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

Make the simple course pass roundtrip test:

2012-08-07 11:06:47 -04:00