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

Conflicts:
	requirements/edx/github.txt

2015-07-22 08:10:26 -04:00

..

auth_exchange

Fix CRI-9 so third_party_auth pipeline always completes, and consolidate auto-enrollment code

2015-06-18 20:57:19 -07:00

cache_toolbox

LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL.

2014-08-07 18:07:41 -04:00

config_models

Allow for keyed ConfigurationModels + New Admin UI

2015-06-02 14:50:45 -07:00

contentserver

Add super() calls to setUp/tearDown that are missing them

2015-05-14 18:14:21 -04:00

cors_csrf

Add proxy to allow IE9 to make xdomain requests

2015-04-03 11:41:31 -04:00

course_action_state

Remove superfluous-parens pylint violations

2015-07-13 17:33:28 -04:00

course_modes

Separate verification deadline from upgrade deadline

2015-07-21 08:43:14 -07:00

dark_lang

Dark lang middleware: Check if user is authenticated

2015-06-30 20:01:00 -04:00

datadog

Remove dogstatsd-python in favor of dogapi

2013-09-11 19:28:58 -04:00

django_comment_common

Convert Meta classes to new-style classes

2015-07-13 17:33:26 -04:00

django_locale

Port django.middleware.locale.LocaleMiddleware from Django 1.8

2015-06-26 13:15:40 -04:00

edxmako

reduce log severity when building marketing links

2015-07-10 16:21:12 -04:00

embargo

Convert Meta classes to new-style classes

2015-07-13 17:33:26 -04:00

enrollment

Remove modulestore dependency from Enrollment API

2015-07-20 13:41:19 -04:00

external_auth

Revert "Decorated instructor dashboard with sudo_required."

2015-07-17 12:11:38 -04:00

geoinfo

Add super() calls to setUp/tearDown that are missing them

2015-05-14 18:14:21 -04:00

heartbeat

Remove "nopep" pragma

2015-02-27 11:49:51 -08:00

lang_pref

Replace deprecated 'django_language' key with LANGUAGE_SESSION_KEY

2015-06-26 13:15:43 -04:00

microsite_configuration

Clean up old style class definitions

2015-07-13 17:33:27 -04:00

monitoring

Eliminate instances of unused-import Pylint violation

2015-07-13 17:33:25 -04:00

monkey_patch

Add super() calls to setUp/tearDown that are missing them

2015-05-14 18:14:21 -04:00

performance

Eliminate instances of unused-import Pylint violation

2015-07-13 17:33:25 -04:00

pipeline_js

Unit page doesn't load when mathjax is down

2015-03-16 15:12:01 +05:00

pipeline_mako

Optimize edxnotes files.

2015-07-21 10:54:02 -04:00

request_cache

Make request_cache easier to use

2015-07-20 14:53:10 -04:00

reverification

ECOM-1494 deleting models from database through new migrations.

2015-06-17 00:49:12 +05:00

service_status

Add super() calls to setUp/tearDown that are missing them

2015-05-14 18:14:21 -04:00

session_inactivity_timeout

add middleware to be able to expire inactive sessions after N seconds

2014-01-24 10:36:21 -05:00

static_replace

Add missing __init__.py files

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

status

Add super() calls to setUp/tearDown that are missing them

2015-05-14 18:14:21 -04:00

student

Merge pull request #8959 from edx/will/separate-verification-and-upgrade-deadline

2015-07-21 09:50:53 -07:00

terrain

Revert "Decorated instructor dashboard with sudo_required."

2015-07-17 12:11:38 -04:00

third_party_auth

Remove Pylint violations deprecated-pragma, bad-option-value

2015-07-13 17:33:26 -04:00

track

Revert "Decorated instructor dashboard with sudo_required."

2015-07-17 12:11:38 -04:00

util

Revert "Decorated instructor dashboard with sudo_required."

2015-07-17 12:11:38 -04:00

xblock_django

Added ability to disable xblock types in LMS.

2015-07-03 20:58:40 +05:00

xmodule_django

Remove unused imports

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