Rocky Duan 028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile ...

Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html

2012-08-18 16:57:00 -07:00

..

management

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00

migrations

Cleaning up pep8 violations

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

tests

Fix the tests of the book url

2012-08-17 09:23:37 -04:00

__init__.py

Moving LMS code into subdirectory

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

access.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00

admin.py

Moving LMS code into subdirectory

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

courses.py

Remove stuff that I should have deleted during the rebase

2012-08-15 14:39:56 -04:00

grades.py

Make start dates work for all modules

2012-08-14 23:30:37 -04:00

models.py

row --> rows

2012-08-15 10:46:33 -04:00

module_render.py

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

2012-08-18 16:57:00 -07: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 profile

2012-08-18 16:57:00 -07:00