Calen Pennington 171e932266 Merge branch 'master' into feature/cale/cms-master ...

Conflicts:
	rakefile

2012-11-08 12:28:40 -05:00

..

management

Remove obsolete eager flag for xml modulestore

2012-08-30 19:26:50 -04:00

migrations

Victor's fixes only apply to sqlite. Added a conditional and now they run on mysql.

2012-08-21 15:02:27 -04:00

tests

add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.

2012-11-01 15:08:26 -04:00

__init__.py

Moving LMS code into subdirectory

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

access.py

Make LMS access depend on which course run the access is occurring in, so that permissions can be based on the course run, rather than the whole course

2012-10-24 11:51:25 -04:00

admin.py

Moving LMS code into subdirectory

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

courses.py

add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.

2012-11-01 15:08:26 -04:00

grades.py

Check for None to fix 3.091 progress tab crash

2012-10-11 13:08:05 -04:00

models.py

Simple PEP8 issues.

2012-11-06 18:14:57 -05:00

module_render.py

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info

2012-11-06 14:20:59 -05:00

progress.py

Cleaning up pep8 violations

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

tabs.py

addressed Cale's feedback

2012-10-30 16:01:28 -04:00

urls.py

Moving LMS code into subdirectory

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

views.py

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info

2012-11-07 09:35:21 -05:00