Adam Palay 3aca0d5472 Merge remote-tracking branch 'origin/release' into adam/merge-release-into-master ...

Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/bulk_email/tasks.py

2015-02-23 18:40:45 -05:00

..

branding

Better support specifying of modulestore configuration in test cases

2015-02-04 09:09:14 -05:00

bulk_email

Merge remote-tracking branch 'origin/release' into adam/merge-release-into-master

2015-02-23 18:40:45 -05:00

certificates

Add tracking code to LinkedIn URL.

2015-02-23 11:52:47 -05:00

circuit

Fix Pylint: W0613(unused-argument)

2015-02-19 19:56:51 -08:00

class_dashboard

Better support specifying of modulestore configuration in test cases

2015-02-04 09:09:14 -05:00

course_structure_api

Added Course Structure API

2015-02-17 13:23:34 -05:00

course_wiki

Better support specifying of modulestore configuration in test cases

2015-02-04 09:09:14 -05:00

courseware

Instructor Dashboard management tools for Entrance Exams

2015-02-23 15:04:05 -05:00

dashboard

Fix Pylint: E0012(bad-option-value)

2015-02-19 19:56:51 -08:00

debug

Add support for UX reference templates in LMS

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

django_comment_client

Remove unreferenced mustache_helpers code

2015-02-16 22:50:11 -08:00

edxnotes

Enforce old mongo for test cases doing locator comparisons.

2015-02-09 10:00:31 -05:00

foldit

Always call super(..).setUp() from setUp

2015-02-04 09:09:14 -05:00

instructor

Instructor Dashboard management tools for Entrance Exams

2015-02-23 15:04:05 -05:00

instructor_analytics

Update for split modulestore as default.

2015-02-09 10:00:14 -05:00

instructor_task

Merge remote-tracking branch 'origin/release' into adam/merge-release-into-master

2015-02-23 18:40:45 -05:00

licenses

Fix Pylint: C0112(empty-docstring)

2015-02-19 19:56:51 -08:00

lms_migration

Unicode fixes for log messages and other things

2015-02-04 09:55:44 +02:00

lms_xblock

xblock-external-ui: Add XBlock API call to render XBlock views

2015-02-16 12:39:38 +01:00

mobile_api

Merge pull request #6797 from edx/mobile/perf_improvements

2015-02-10 16:21:37 -05:00

notes

Fix Pylint: E0012(bad-option-value)

2015-02-19 19:56:51 -08:00

notification_prefs

Add ENABLE_DISCUSSION_EMAIL_DIGEST feature, to enable discussion emails digest by default for all users

2015-02-19 14:34:10 +08:00

notifier_api

Added Course Structure API

2015-02-17 13:23:34 -05:00

oauth2_handler

Updated _get_courses_with_access_type

2015-02-06 20:19:42 -05:00

open_ended_grading

Merge pull request #6929 from edx/release

2015-02-09 11:14:41 -05:00

psychometrics

Fixed problems with psychometrics

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

shoppingcart

Fix Pylint: C0202(bad-classmethod-argument)

2015-02-19 19:56:51 -08:00

static_template_view

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

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

staticbook

Better support specifying of modulestore configuration in test cases

2015-02-04 09:09:14 -05:00

student_account

Preserve enrollment_action and course_id querystring params in header 'Sign In' button

2015-02-23 11:12:06 -05:00

survey

Fix Pylint: E0012(bad-option-value)

2015-02-19 19:56:51 -08:00

verify_student

Country Access: block enrollment

2015-02-10 13:07:51 -05:00

__init__.py

Add a configuration model for managing XBlockAsides

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