Chris Dodge 22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 ...

Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

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

..

management

example course_id for compute_grades management command

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

__init__.py

move instructor dashboard into its own lms djangoapp; add new

2012-09-02 19:05:34 -04:00

offline_gradecalc.py

add offline grade computation & DB table for this

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

tests.py

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

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

views.py

Merge pull request #1280 from MITx/feature/jth/attempts_reset

2013-01-16 13:48:26 -08:00