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

..

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

external_auth

suggested username for ssl auth is conjoined name with no spaces

2012-08-05 21:12:56 -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 branch 'master' of github.com:MITx/mitx into merge

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

track

cleanup syntax, split long if into two lines

2012-08-06 14:37:17 -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

small fix to xmodule_modifiers to fix case when filename missing

2012-08-06 18:34:54 -04:00