Renzo Lucioni 3b2d067e79 Resolve merge conflict between master and release

2015-05-29 11:17:49 -04:00

..

branding

ECOM-1339 Branding API footer

2015-05-28 08:30:45 -04:00

bulk_email

Merge pull request #7996 from edx/shr/bug/TNL-2119-Unicode-error-in-templating-bulk-course

2015-05-15 23:31:01 +05:00

ccx

Add super() calls to setUp/tearDown that are missing them

2015-05-14 18:14:21 -04:00

certificates

ECOM-1494 removing code from models.

2015-05-27 16:32:26 +05:00

circuit

Fix Pylint: W0613(unused-argument)

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

class_dashboard

Split lms unittests into multiple shards

2015-05-07 09:17:26 -04:00

commerce

Suppress email for refunds unless mode is verified.

2015-05-28 17:26:36 -04:00

course_structure_api

Refactor and add tests for new grade report.

2015-05-13 06:58:02 -04:00

course_wiki

Split lms unittests into multiple shards

2015-05-07 09:17:26 -04:00

courseware

TNL-2269 Compute language direction every time.

2015-05-28 16:13:59 -04:00

dashboard

Split lms unittests into multiple shards

2015-05-07 09:17:26 -04:00

debug

Add support for UX reference templates in LMS

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

discussion_api

Add "following" parameter to thread creation

2015-05-27 10:58:14 -04:00

django_comment_client

Add thread creation to discussion API

2015-05-26 12:42:40 -04:00

edxnotes

Update student notes eventing for tags.

2015-05-19 13:14:10 -04:00

foldit

Fix unidiomatic type checking

2015-03-20 15:48:54 -04:00

instructor

SOL-794 Detailed Enrollment Report

2015-05-22 15:16:57 -04:00

instructor_analytics

Remove unused imports

2015-03-17 07:10:31 -04:00

instructor_task

Fix bug when student scoring error occurs with no message.

2015-05-28 16:49:02 -04:00

licenses

Remove unused imports

2015-03-17 07:10:31 -04:00

lms_migration

Fix unidiomatic type checking

2015-03-20 15:48:54 -04:00

lms_xblock

Revert "Enable PyContracts during tests"

2015-05-22 15:05:11 -04:00

lti_provider

[LTI Provider] Documentation fix

2015-05-27 15:37:30 -04:00

mailing

Docstrings for mailchimp scripts

2015-04-28 10:23:10 -04:00

mobile_api

Merge pull request #8212 from edx/mobile/API_decorators

2015-05-27 15:36:48 -04:00

notes

Fix unidiomatic type checking

2015-03-20 15:48:54 -04:00

notification_prefs

Add missing __init__.py files

2015-04-30 07:43:08 -04:00

notifier_api

Silence unrelated warnings

2015-03-14 13:35:18 -07:00

oauth2_handler

Add the preferences endpoint to the User API

2015-03-16 23:34:35 -04:00

open_ended_grading

Revert "Enable PyContracts during tests"

2015-05-22 15:05:11 -04:00

psychometrics

Fixed problems with psychometrics

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

shoppingcart

Merge pull request #7992 from edx/muhhshoaib/SOL-794-generate-detailed-enrollment-report

2015-05-26 15:57:22 -04:00

static_template_view

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

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

staticbook

Remove unused imports

2015-03-17 07:10:31 -04:00

student_account

Updating the django-countries version to support sorting.

2015-05-15 17:07:14 +05:00

student_profile

Updating the django-countries version to support sorting.

2015-05-15 17:07:14 +05:00

survey

Add an additional sentance (per customer) on how the survey information will be used

2015-04-27 10:24:47 -04:00

verify_student

ECOM-1494 removing code from models.

2015-05-27 16:32:26 +05:00

xblock_user_state

Add an empty implementation of XBlockUserStateClient backed by StudentModule

2015-05-20 15:07:27 -04:00

__init__.py

Add a configuration model for managing XBlockAsides

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