e0d d52b959ff1 fixing merge conflicts

2013-12-16 15:02:14 -05:00

..

analytics

Use XBlock 0.3

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

branding

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

bulk_email

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

certificates

Use Choices to track possible modes.

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

circuit

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

course_wiki

Updating comments and docs for MITx -> edX transition

2013-12-10 13:21:18 -05:00

courseware

fixing merge conflicts

2013-12-16 15:02:14 -05:00

dashboard

Add sysadmin dashboard

2013-12-15 19:06:05 -05:00

debug

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

django_comment_client

Merge pull request #1907 from edx/db/whitespace-fixes

2013-12-13 11:40:54 -08:00

foldit

change models to filter by course

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

instructor

Fix acceptance test to wait for text area to be populated

2013-12-13 13:13:21 -05:00

instructor_task

Update factory_boy to 2.2.1

2013-12-05 15:50:49 -05:00

licenses

Update factory_boy to 2.2.1

2013-12-05 15:50:49 -05:00

lms_migration

Update logging.getLogger() calls to use edx instead of mitx

2013-12-04 15:18:15 -05:00

multicourse

MITX_ROOT_URL => EDX_ROOT_URL

2013-12-04 12:59:35 -05:00

notes

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

notification_prefs

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

open_ended_grading

Create explicit Locations.

2013-12-12 14:37:00 -05:00

psychometrics

Update logging.getLogger() calls to use edx instead of mitx

2013-12-04 15:18:15 -05:00

shoppingcart

response to cr

2013-12-10 18:51:45 +00:00

static_template_view

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

staticbook

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

user_api

Update factory_boy to 2.2.1

2013-12-05 15:50:49 -05:00

verify_student

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00