Kevin Falcone 8f016414f9 Merge pull request #8348 from edx/release-2015-06-02-conflict ...

Release 2015 06 02 conflict

2015-06-04 09:20:12 -04:00

..

branding

Merge branch 'release'

2015-06-03 16:12:32 -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

Convert all tabs to the new plugin framework.

2015-06-02 15:05:16 -04:00

certificates

Analytics events for badges.

2015-06-02 18:32:50 +00: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

Disabled CSRF Validation for checkout cancel page

2015-06-03 17:14:21 -04:00

course_structure_api

Refactor and add tests for new grade report.

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

course_wiki

Convert all tabs to the new plugin framework.

2015-06-02 15:05:16 -04:00

courseware

Bug - Unicode character in tab number shouldn't return 500 #TNL-2055

2015-06-04 12:33:06 +05: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

Merge pull request #8199 from edx/clee/get_topic_threads

2015-06-03 12:29:05 -04:00

django_comment_client

Convert all tabs to the new plugin framework.

2015-06-02 15:05:16 -04:00

edxnotes

Convert all tabs to the new plugin framework.

2015-06-02 15:05:16 -04:00

foldit

Fix unidiomatic type checking

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

instructor

SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes

2015-06-03 14:46:01 -04:00

instructor_analytics

SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes

2015-06-03 14:46:01 -04:00

instructor_task

SOL-236 Manual Enrollments

2015-06-02 13:19:32 -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] Bugfix in LtiConsumer handling code

2015-06-03 14:34:36 -04:00

mailing

Docstrings for mailchimp scripts

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

mobile_api

Fix simplifiable-range pylint warnings.

2015-06-02 09:47:13 -04:00

notes

Convert all tabs to the new plugin framework.

2015-06-02 15:05:16 -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

Convert all tabs to the new plugin framework.

2015-06-02 15:05:16 -04:00

psychometrics

Fixed problems with psychometrics

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

shoppingcart

Merge pull request #8348 from edx/release-2015-06-02-conflict

2015-06-04 09:20:12 -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

teams

TNL-1897 Implement Course Team API

2015-06-03 18:04:17 +00:00

verify_student

Merge branch 'release'

2015-06-03 16:12:32 -04: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