Don Mitchell 3885e6cf78 Merge branch 'release' ...

Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html

2014-01-16 12:51:22 -05:00

..

analytics

…

branding

Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org

2014-01-14 14:36:01 -05:00

bulk_email

Replace authz fns with roles.py ones

2014-01-14 17:04:44 -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

Replace authz fns with roles.py ones

2014-01-14 17:04:44 -05:00

courseware

Merge branch 'release'

2014-01-16 12:51:22 -05:00

dashboard

Moved roles.py to common student

2014-01-14 17:04:43 -05:00

debug

Enable pure XBlocks, but behind a feature flag

2014-01-10 11:40:03 -05:00

django_comment_client

i18n: externalize strings in discussion forums templates and python code.

2014-01-15 14:26:22 -05:00

foldit

…

instructor

Merge branch 'release'

2014-01-16 12:51:22 -05:00

instructor_task

Logging to catch duplicate instructor tasks

2014-01-06 18:20:41 -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

Moved roles.py to common student

2014-01-14 17:04:43 -05:00

psychometrics

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

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

shoppingcart

Merge branch 'release'

2014-01-16 12:51:22 -05: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

Migrations

2014-01-06 15:53:27 +00:00