Will Daly 42ac76ce0c Merge branch 'master' into lapentab/fix_network_tests ...

Conflicts:
	lms/djangoapps/courseware/tests/tests.py

2013-08-23 11:48:38 -04:00

..

auth

Make get_errored_courses part of the modulestore API (with default implementation).

2013-08-15 12:50:37 -04:00

contentstore

Merge branch 'master' into lapentab/fix_network_tests

2013-08-23 11:48:38 -04:00

course_creators

Send notification to admin when a user enters 'pending' state.

2013-08-06 16:26:33 -04:00

models

Allow course image uploads in the settings page.

2013-08-21 09:42:00 -04:00