Dennis Jen 4a37648f36 Merge pull request #6504 from edx/release-merge-test ...

Merge release (2015-01-08) into master

2015-01-08 16:16:03 -05:00

..

branding

also apply sorting rules overrides to the /courses view

2014-12-15 14:11:58 -05:00

bulk_email

PR updates

2015-01-05 17:38:18 -05:00

certificates

Fixing pep8 issues

2014-12-11 13:04:49 -05:00

circuit

mitxmako => edxmako

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

class_dashboard

Clean up all modulestore testcases

2014-12-02 07:09:36 -05:00

course_wiki

Clean up all modulestore testcases

2014-12-02 07:09:36 -05:00

courseware

Merge pull request #6398 from edx/mobile/MA-199

2015-01-07 20:19:27 -05:00

dashboard

Fixing pep8 issues

2014-12-11 13:04:49 -05:00

debug

Add support for UX reference templates in LMS

2014-09-11 13:52:48 -04:00

django_comment_client

Merge pull request #6469 from edx/release

2015-01-06 17:16:32 -05:00

foldit

s/pylint: disable=W0621/pylint: disable=redefined-outer-name/

2014-12-01 11:22:08 -05:00

instructor

mock html_to_text for tests

2015-01-05 16:19:36 -05:00

instructor_analytics

WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page

2014-12-31 17:45:31 +05:00

instructor_task

Merge pull request #6403 from edx/clytwynec/remove_lynx_from_bulk_email

2015-01-08 14:10:12 -05:00

licenses

Clean up all modulestore testcases

2014-12-02 07:09:36 -05:00

lms_migration

Fixing pep8 issues

2014-12-11 13:04:49 -05:00

lms_xblock

Get students experiments, groups, and cohorts

2015-01-08 14:29:53 +05:00

mobile_api

MA-199 Course Authorization framework in mobile API.

2015-01-07 19:31:02 -05:00

notes

Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it

2014-12-12 21:45:21 -05:00

notification_prefs

Add base support for cohorted group configurations

2014-12-05 09:52:26 -05:00

notifier_api

Add support for user partitioning based on cohort.

2014-12-05 09:53:44 -05:00

oauth2_handler

Add base support for cohorted group configurations

2014-12-05 09:52:26 -05:00

open_ended_grading

Teach LMS how to render XBlockAsides

2014-12-13 08:26:28 -05:00

psychometrics

Fixed problems with psychometrics

2014-09-17 11:25:00 -04:00

shoppingcart

Merge branch 'release'

2015-01-08 15:02:26 -05:00

static_template_view

Prep marketing iframe and relevant courseware view for email opt-in

2014-12-01 10:30:16 -05:00

staticbook

Clean up all modulestore testcases

2014-12-02 07:09:36 -05:00

student_account

Merge branch 'release'

2014-12-09 17:39:17 -05:00

student_profile

Add base support for cohorted group configurations

2014-12-05 09:52:26 -05:00

survey

s/pylint: disable=R0924/pylint: disable=incomplete-protocol/

2014-12-01 11:22:11 -05:00

verify_student

Merge pull request #6414 from edx/alasdair/decoupled-verified-state-copy-cleanup

2014-12-31 14:40:15 -05:00

__init__.py

Add a configuration model for managing XBlockAsides

2014-12-12 21:45:21 -05:00