Adam Palay 4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 ...

Conflicts:
	requirements/edx/github.txt

2015-06-29 16:55:57 -04:00

..

branding

ECOM-1724 a11y footer updates

2015-06-12 11:34:39 -04:00

bulk_email

Updating account_settings_url for bulk emails.

2015-06-09 19:02:42 +05:00

ccx

Merge pull request #8594 from cpennington/pass-xblock-parents

2015-06-26 12:15:41 -04:00

certificates

mattdrayer/ECOM-1773: Fixed invalid URL reversal

2015-06-22 14:04:43 -04: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

XCOM-416: Embargo restrictions are now enforced during logistration

2015-06-23 14:17:43 -04:00

course_structure_api

Pass XBlock parents down to their children when constructing them, for caching

2015-06-25 13:59:46 -04:00

course_wiki

Switch tabs to use ugettext_noop for titles.

2015-06-23 11:08:41 -04:00

courseware

Merge remote-tracking branch 'origin/release' into rc/2015-06-29

2015-06-29 16:55:57 -04:00

dashboard

MIT CCX: Use CCX Keys: further revisions in response to code review

2015-06-12 11:20:30 -07:00

debug

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

discussion_api

Merge pull request #8589 from edx/gprice/discussion-api-abuse-flagged

2015-06-23 18:08:58 -04:00

django_comment_client

Merge pull request #8617 from edx/diana/course-tab-cleanup

2015-06-23 12:33:06 -04:00

edxnotes

Switch tabs to use ugettext_noop for titles.

2015-06-23 11:08:41 -04:00

foldit

Fix unidiomatic type checking

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

instructor

Switch tabs to use ugettext_noop for titles.

2015-06-23 11:08:41 -04:00

instructor_analytics

Fixed the empty list price issue.

2015-06-16 17:46:05 +05:00

instructor_task

fix price per seat

2015-06-19 10:27:53 -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] Added an authentication backend to log in LTI users

2015-06-26 13:25:13 -04:00

mailing

Docstrings for mailchimp scripts

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

mobile_api

MA-776 change UserCourseEnrollmentsList endpoint to use course_overviews

2015-06-22 18:33:12 -04:00

notes

Switch tabs to use ugettext_noop for titles.

2015-06-23 11:08:41 -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

Refactor and merge CourseViewType and CourseTab.

2015-06-08 15:18:39 -04:00

psychometrics

Fixed problems with psychometrics

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

shoppingcart

Don't i18n test files

2015-06-26 17:50:21 -04:00

static_template_view

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

staticbook

Remove unused imports

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

student_account

New Hinted Login View - PR 8591

2015-06-26 13:24:01 -07: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

Switch tabs to use ugettext_noop for titles.

2015-06-23 11:08:41 -04:00

verify_student

Update Bok Choy to use optimized static assets

2015-06-25 09:58:27 -04:00

__init__.py

Add a configuration model for managing XBlockAsides

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