Adam Palay 9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html

2015-10-19 08:35:33 -05:00

..

branding

Fixed pylint violation for files in lms/djangoapps/branding

2015-10-14 14:32:56 -04:00

bulk_email

Fixed pylint violation for files in lms/djangoapps/bulk_email

2015-10-14 14:45:32 -04:00

ccx

Fixed pylint violation for files in lms/djangoapps/ccx

2015-10-16 14:15:29 -04:00

certificates

Merge pull request #10201 from mitocw/gdm_fix_pylint_lms.djangoapps.certificates

2015-10-16 00:15:10 -04:00

circuit

Fix Pylint: W0613(unused-argument)

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

class_dashboard

Convert class dashboard tests to use SharedModuleStoreTestCase.

2015-08-25 01:57:47 -04:00

commerce

Merge pull request #9979 from edx/bderusha/boardman-traffic

2015-10-05 14:55:55 -04:00

course_structure_api

DRF uses query_params instead of QUERY_PARAMS.

2015-09-30 20:45:40 +05:00

course_wiki

change redirect url from '/accounts/login' to '/login'

2015-07-02 18:44:10 +05:00

courseware

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

2015-10-19 08:35:33 -05:00

dashboard

Change imports from path to use the stablest name.

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

debug

Change imports from path to use the stablest name.

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

discussion_api

MA-1240 - DiscussionAPI: fixed thread-list order-by RecentActivity

2015-10-14 11:06:21 +05:00

django_comment_client

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

2015-10-19 08:35:33 -05: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

Add email and manual enrollment reason into the Enrollment Report

2015-10-06 22:34:54 -04:00

instructor_analytics

Add team column to grade reports.

2015-09-23 12:21:13 -04:00

instructor_task

Add email and manual enrollment reason into the Enrollment Report

2015-10-06 22:34:54 -04:00

licenses

Upgrade factory_boy

2015-09-18 18:02:38 +05:00

lms_migration

Change imports from path to use the stablest name.

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

lms_xblock

In-course reverification access control

2015-08-20 08:43:55 -07:00

lti_provider

MA-1337 xBlock Rendering View

2015-09-21 16:17:11 -04:00

mailing

Docstrings for mailchimp scripts

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

mobile_api

MA-1248 - CourseEnrollmentAPI: added discussion URL

2015-10-09 19:04:55 +05: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

Revert "Merge DRF 3.1 in to master"

2015-09-28 17:12:43 -04:00

oauth2_handler

Optimize OpenID Course Claims for users.

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

open_ended_grading

Better fix for open ended grading.

2015-07-21 14:39:19 +00:00

psychometrics

Remove logging-not-lazy Pylint violations

2015-07-13 17:34:54 -04:00

shoppingcart

Merge pull request #9979 from edx/bderusha/boardman-traffic

2015-10-05 14:55:55 -04: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

Add new clickjacking decorator that whitelists LTI consumers.

2015-10-07 11:20:51 -04:00

student_profile

Team API include correct info when expanding users TNL-2975

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

support

Support team UI for regenerating certificates

2015-08-12 07:09:46 -07:00

survey

add the ability to persist the course_key where the user answered the survey

2015-08-21 13:40:57 -04:00

teams

Fix displaying wrong membership on "My Team" view.

2015-10-07 11:35:24 -04:00

verify_student

Update Credit Eligibility Table for Skips

2015-10-15 19:03:07 +05:00

__init__.py

Add a configuration model for managing XBlockAsides

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