Calen Pennington 73d6565fac Merge remote-tracking branch 'origin/hotfix/1.0.1' ...

Conflicts:
	common/djangoapps/student/views.py

2012-07-26 09:05:57 -04:00

..

cache_toolbox

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

django_future

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

monitoring

Move libraries that can only be imported in the context of django into common/djangoapps

2012-06-18 13:48:26 -04:00

pipeline_mako

Merge branch 'release/1.0'

2012-07-24 08:52:50 -04:00

student

Merge remote-tracking branch 'origin/hotfix/1.0.1'

2012-07-26 09:05:57 -04:00

track

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

util

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

static_replace.py

Only munge /static/ urls in module html to point to course static files if they don't exist in the global static locations

2012-07-12 16:09:34 -04:00

xmodule_modifiers.py

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

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