Han Su Kim bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved ...

Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt

2014-03-06 16:56:16 -05:00

..

analytics

Use XBlock 0.3

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

branding

Merge pull request #2738 from edx/dbarch/mixed_ms_router

2014-03-05 17:17:07 -05:00

bulk_email

Consolidate course_id triple parsing

2014-02-24 11:45:59 -05:00

certificates

Consolidate course_id triple parsing

2014-02-24 11:45:59 -05:00

circuit

mitxmako => edxmako

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

class_dashboard

New tab (Metrics) in instructor dashboard

2014-02-28 14:01:44 -08:00

course_wiki

add some authorization checks to the Wiki

2014-02-28 13:36:18 -05:00

courseware

Merge remote-tracking branch 'origin/master' into release, conflicts resolved

2014-03-06 16:56:16 -05:00

dashboard

Consolidate course_id triple parsing

2014-02-24 11:45:59 -05:00

debug

Enable pure XBlocks, but behind a feature flag

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

django_comment_client

assign default forum role 'Student' to user on course recreate with same name STUD-1140

2014-02-26 15:40:44 +05:00

foldit

Remove unused imports.

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

instructor

Prevent reflected XSS in instructor dashboard.

2014-03-05 11:45:45 -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

Merge pull request #2660 from edx/dbarch/parse_course_id

2014-02-24 13:24:00 -05:00

psychometrics

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

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

shoppingcart

Fix unicode issue in shopping cart

2014-03-06 11:46:53 +01: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