Victor Shnayder 6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts ...

Conflicts:
	common/djangoapps/student/models.py

2013-01-26 12:37:26 -05:00

..

features

Fixed tests to work OK so far.

2013-01-02 10:44:21 -05:00

management

Remove obsolete eager flag for xml modulestore

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

migrations

add offline grade computation & DB table for this

2013-01-10 23:32:48 -05:00

tests

fix up testing failures post merge

2013-01-17 09:48:10 -05:00

__init__.py

Moving LMS code into subdirectory

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

access.py

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2013-01-22 14:47:52 -05:00

admin.py

add offline grade computation & DB table for this

2013-01-10 23:32:48 -05:00

courses.py

Started integration work with Kevin's cohort changes

2013-01-24 15:14:33 -05:00

grades.py

Use get_child_descriptors for grades.py

2013-01-10 13:55:46 -05:00

models.py

add offline grade computation & DB table for this

2013-01-10 23:32:48 -05:00

module_render.py

Catch ItemNotFound errors at the top of get_module, rather than in get_module_for_descriptor, to maintain previous LMS behavior

2013-01-10 14:30:12 -05:00

progress.py

Cleaning up pep8 violations

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

tabs.py

Merge branch 'master' into feature/cdodge/cms-master-merge4

2013-01-17 09:15:37 -05:00

urls.py

Moving LMS code into subdirectory

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

views.py

Merge remote-tracking branch 'origin/master' into feature/victor/cohorts

2013-01-26 12:37:26 -05:00