Rocky Duan 8684ae29b2 Merge branch 'master' of github.com:MITx/mitx into refactor ...

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt

2012-08-20 15:31:51 -07:00

..

management

add out-of-date message to check_course

2012-08-20 09:26:16 -04:00

migrations

Cleaning up pep8 violations

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

tests

Fixed tests from profile->progress rename.

2012-08-20 14:08:42 -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

Keep each course's descriptors separate

2012-08-20 09:26:16 -04:00

grades.py

Keep each course's descriptors separate

2012-08-20 09:26:16 -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 refactor

2012-08-20 15:31:51 -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 refactor

2012-08-20 15:31:51 -07:00