Brian Beggs 141e0a93c7 Merge branch 'master' into dj18-release-merge

2015-11-19 13:36:13 -05:00

..

branding

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

bulk_email

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

ccx

Merge remote-tracking branch 'origin/release' into dj18-release-merge

2015-11-18 17:53:44 +05:00

certificates

Merge branch 'master' into dj18-release-merge

2015-11-19 13:36:13 -05:00

class_dashboard

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

commerce

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

course_api

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

course_blocks

MA-1624 Unit tests for User Partition Transformer.

2015-11-16 16:30:38 -05:00

course_structure_api

Transformer: StudentViewTransformer

2015-11-05 23:29:12 +00:00

course_wiki

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

courseware

Merge remote-tracking branch 'origin/release' into dj18-release-merge

2015-11-18 17:53:44 +05:00

dashboard

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

debug

Change imports from path to use the stablest name.

2015-08-27 12:59:25 -04:00

discussion_api

Emit events when users vote on forum posts.

2015-11-18 16:21:50 +01:00

django_comment_client

Merge branch 'master' into dj18-release-merge

2015-11-19 13:36:13 -05:00

edxnotes

basic programs api setup and dashboard integration

2015-10-29 20:07:51 +05:00

foldit

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

instructor

resolve merge conflicts

2015-11-18 19:13:54 +05:00

instructor_analytics

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

instructor_task

Merge remote-tracking branch 'origin/release' into dj18-release-merge

2015-11-18 17:53:44 +05:00

licenses

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

lms_migration

Change imports from path to use the stablest name.

2015-08-27 12:59:25 -04:00

lms_xblock

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

lti_provider

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

mailing

Docstrings for mailchimp scripts

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

mobile_api

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

notes

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

notification_prefs

Add missing __init__.py files

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

notifier_api

Remove pylint pragmas from "class Meta"

2015-10-21 07:37:00 -04:00

oauth2_handler

Optimize OpenID Course Claims for users.

2015-09-17 11:29:28 -04:00

open_ended_grading

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

psychometrics

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

shoppingcart

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

static_template_view

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

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

staticbook

MA-849: Change has_access return type

2015-07-19 20:42:29 -04:00

student_account

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

student_profile

Team API include correct info when expanding users TNL-2975

2015-08-12 14:33:07 -04:00

support

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

survey

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

teams

resolve merge conflicts

2015-11-18 19:13:54 +05:00

verify_student

Merge remote-tracking branch 'origin/release' into dj18-release-merge

2015-11-18 17:53:44 +05:00

__init__.py

…