Ned Batchelder c8a7b259ff Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00

..

analytics

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

branding

fixes a branding test which was passing for a trivial (wrong) reason

2013-11-22 23:18:11 -08:00

bulk_email

Formalize various access roles as objects

2013-11-13 13:42:37 -05:00

certificates

Use Choices to track possible modes.

2013-11-22 11:22:49 -05:00

circuit

Remove pointless addition tests

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

course_wiki

Make remaining dialogs in wiki accessible.

2013-11-25 16:05:05 -05:00

courseware

Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00

dashboard

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

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

debug

Add a management command to dump xml courses

2013-09-27 10:57:39 -04:00

django_comment_client

Fix pylint/pep8 errors

2013-11-08 11:08:48 -05:00

foldit

change models to filter by course

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

instructor

Fix error case where we have items in our grading csv output

2013-11-22 10:06:28 -05:00

instructor_task

Fix error case where we have items in our grading csv output

2013-11-22 10:06:28 -05:00

licenses

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00

lms_migration

fix-setattr-and-getattr

2013-09-13 14:44:49 -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

Formalize various access roles as objects

2013-11-13 13:42:37 -05:00

psychometrics

Change wildcard imports into specific imports

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

shoppingcart

New migrations file

2013-11-27 15:16:25 +00:00

static_template_view

Remove static_template_view tests

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

staticbook

Fixed tests name in staticbook

2013-09-23 12:58:14 +00:00

user_api

make user_api compatible with HTTP basic auth

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

verify_student

Response to CR

2013-11-08 16:27:42 +00:00