Jay Zoldak a620cc0004 Merge branch 'release' ...

Conflicts:
	lms/templates/courseware/accordion.html

2014-02-21 16:17:02 -05:00

..

analytics

Use XBlock 0.3

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

branding

Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform.

2014-02-04 10:50:48 -05:00

bulk_email

Clean up of modulestore references (primarly LMS).

2014-02-11 14:29:22 -05:00

certificates

re-verification dashboard styles

2014-01-31 21:48:35 +00:00

circuit

mitxmako => edxmako

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

course_wiki

i18n fixes for wiki templates.

2014-02-10 15:23:13 -05:00

courseware

Merge branch 'release'

2014-02-21 16:17:02 -05:00

dashboard

Clean up of modulestore references (primarly LMS).

2014-02-11 14:29:22 -05:00

debug

Enable pure XBlocks, but behind a feature flag

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

django_comment_client

django_comment_client: add unit test for (sub)comment deletion.

2014-02-20 13:35:26 -05:00

foldit

Remove unused imports.

2014-02-10 14:07:50 -05:00

instructor

Clean up of modulestore references (primarly LMS).

2014-02-11 14:29:22 -05:00

instructor_task

update_item and other refactorings continued

2014-02-05 10:24:24 -05:00

licenses

Update factory_boy to 2.2.1

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

linkedin

Change the from address for LinkedIn emails

2014-01-30 11:58:28 -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

annotation tools

2014-01-27 13:47:58 -05:00

notification_prefs

Notifier re-subcribe via link

2014-01-22 09:54:27 -08:00

open_ended_grading

Implement children for pure XBlocks in edx-platform

2014-02-21 15:01:20 -05:00

psychometrics

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

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

shoppingcart

Remove unused imports.

2014-02-10 14:07:50 -05:00

static_template_view

mitxmako => edxmako

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

staticbook

annotation tools

2014-01-27 13:47:58 -05:00

verify_student

Remove unused imports.

2014-02-10 14:07:50 -05:00