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

..

management

make clean_xml script work with stringified errors

2012-08-03 11:53:35 -04:00

migrations

Cleaning up pep8 violations

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

tests

Address minor comments in #313

2012-08-01 11:40:12 -04:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

admin.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

courses.py

isinstance instead of type

2012-08-06 14:10:00 -04:00

grades.py

Leftover name->url_name fixes

2012-08-03 14:45:43 -04:00

models.py

Cleaning up pep8 violations

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

module_render.py

Merge branch 'master' of github.com:MITx/mitx into merge

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

progress.py

Cleaning up pep8 violations

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

urls.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

views.py

Merge branch 'master' of github.com:MITx/mitx into merge

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