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

..

analytics

Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.

2013-08-14 13:23:06 -04:00

branding

WIP

2013-08-15 22:58:02 -04:00

certificates

convert all datetime.now() to datetime.now(UTC)

2013-07-22 17:39:11 -04:00

circuit

Remove pointless addition tests

2013-06-27 16:27:39 -04:00

course_wiki

Removed unnecessary settings wrangling from ModuleStoreTestCase.

2013-08-21 09:36:45 -04:00

courseware

Merge branch 'master' into lapentab/fix_network_tests

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

dashboard

Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.

2013-08-14 13:23:06 -04:00

debug

Remove unused imports from lms, as detected by pylint.

2013-06-19 16:56:34 -04:00

django_comment_client

Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests

2013-08-23 08:38:09 -07:00

foldit

change models to filter by course

2013-07-19 11:03:25 -04:00

instructor

Common djangoapps no longer access courseware; other cleanup

2013-08-22 14:08:35 -04:00

instructor_task

Removed unnecessary settings wrangling from ModuleStoreTestCase.

2013-08-21 09:36:45 -04:00

licenses

Removed unnecessary settings wrangling from ModuleStoreTestCase.

2013-08-21 09:36:45 -04:00

lms_migration

Pylint complains if you use string, even if you use it for what its still meant to be used for.

2013-06-21 16:35:47 -04:00

multicourse

Remove simplewiki from the codebase

2013-06-20 09:06:29 -04:00

notes

Add a manage.py command that understands the extra edX options

2013-07-24 09:04:12 -04:00

notification_prefs

notification_prefs/views: correct docstring

2013-07-30 02:30:45 -04:00

open_ended_grading

Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests

2013-08-23 08:38:09 -07:00

psychometrics

Change wildcard imports into specific imports

2013-06-21 17:33:06 -04:00

shoppingcart

Remove unnecessary verified certificate view.

2013-08-22 15:58:13 -04:00

static_template_view

Remove static_template_view tests

2013-07-09 12:54:50 -04:00

staticbook

Pep8/pylint fixes

2013-08-21 19:42:59 -04:00

user_api

make user_api compatible with HTTP basic auth

2013-07-30 17:13:48 -04:00