Rocky Duan 8228bebc2a Merge branch 'master' of github.com:MITx/mitx ...

Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py

2012-07-30 17:41:19 -04:00

..

management

Formatting and little bugfixes

2012-07-27 16:09:25 -04:00

migrations

Cleaning up pep8 violations

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

tests

Config for integration tests

2012-07-27 16:09:25 -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

course_settings.py

Cleaning up pep8 violations

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

courses.py

Address review comments

2012-07-24 14:46:46 -04:00

grades.py

Merge remote-tracking branch 'origin/master' into cpennington/lms-descriptors

2012-07-02 10:31:26 -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

2012-07-30 17:41:19 -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

2012-07-30 17:41:19 -04:00