Feanil Patel 5e5c59cab2 Merge remote-tracking branch 'origin/release' ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.

2014-02-03 16:39:40 -05:00

..

analytics

Use XBlock 0.3

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

branding

catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting

2014-01-16 17:04:17 -05:00

bulk_email

Merge remote-tracking branch 'origin/release'

2014-02-03 16:39:40 -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

Eliminate unused import and gratuitous prints

2014-01-23 16:12:18 -08:00

courseware

Merge remote-tracking branch 'origin/release'

2014-02-03 16:39:40 -05:00

dashboard

Moved reverification windows into common

2014-01-31 22:08:08 +00:00

debug

Enable pure XBlocks, but behind a feature flag

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

django_comment_client

Merge pull request #2377 from edx/gprice/forum-thread-pagination

2014-02-03 08:55:20 -08:00

foldit

change models to filter by course

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

instructor

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

instructor_task

Make code safe for unicode course ids

2014-01-31 16:35:56 -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

Unicode changes to support QRF

2014-01-30 16:20:36 -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

annotation tools

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

user_api

Update factory_boy to 2.2.1

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

verify_student

Midcourse reverification: i18n fixes

2014-01-31 22:20:33 +00:00