Adam Palay 8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master ...

Conflicts:
	common/test/acceptance/tests/video/test_video_times.py

2015-05-08 10:23:04 -04:00

..

branding

(SOL-531)(SOL-532)Course Cards update; A link to course discovery page has been added to the OpenEdX homepage

2015-04-14 14:58:06 +02:00

bulk_email

Revert "Revert "use different queue for smaller emails (TNL-1591)""

2015-04-15 12:03:23 -04:00

ccx

Fixes for course import-export:

2015-05-01 18:36:14 +03:00

certificates

Add certificate columns to existing grade report

2015-05-05 17:43:08 +05:00

circuit

Fix Pylint: W0613(unused-argument)

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

class_dashboard

Remove unused imports

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

commerce

fix ecommerce api calls in verify_student and update tests.

2015-05-06 23:44:25 -04:00

course_structure_api

Fix trailing whitespace issues

2015-04-02 16:32:22 -04:00

course_wiki

Remove unused imports

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

courseware

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

2015-05-08 10:23:04 -04:00

dashboard

Add missing __init__.py files

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

debug

Add support for UX reference templates in LMS

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

discussion_api

Add params to CS query in thread list endpoint

2015-05-07 15:59:23 -04:00

django_comment_client

Link to learner profile page from username in discussions.

2015-04-17 17:23:15 -04:00

edxnotes

Remove unused imports

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

foldit

Fix unidiomatic type checking

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

instructor

Add missing __init__.py files

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

instructor_analytics

Remove unused imports

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

instructor_task

Add certificate columns to existing grade report

2015-05-05 17:43:08 +05: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

Add caching to partitions_service.

2015-03-18 14:55:16 -04:00

lti_provider

[LTI Provider] Addressing review comments

2015-04-28 10:35:44 -04:00

mailing

Docstrings for mailchimp scripts

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

mobile_api

Clean ID of course_module for push notification channel name.

2015-04-18 15:30:19 -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

Remove unused imports

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

psychometrics

Fixed problems with psychometrics

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

shoppingcart

Deprecated Verify Later Page

2015-05-05 16:42:27 -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

Fixed gettext references.

2015-04-17 17:23:18 -04:00

student_profile

Fixing the micro-sites naming issues for profile page.

2015-04-27 15:04:45 -04: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-1476: sending email on software secure response initial work

2015-05-07 18:56:49 +05:00

__init__.py

Add a configuration model for managing XBlockAsides

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