Rocky Duan 7c58fd27a1 Merge branch 'master' of github.com:MITx/mitx ...

Conflicts:
	lms/templates/profile.html

2012-08-04 18:07:27 -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

match external_domain as well when retrieving ExternalAuthMap objects

2012-08-02 13:28:52 -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

2012-08-04 18:07:27 -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

Responding to comments on pull #326

2012-08-02 09:56:01 -04:00