Will Daly 104bcd5143 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	common/djangoapps/student/views.py
	openedx/core/djangoapps/credit/tests/test_api.py

2015-07-07 09:58:45 -07: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

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

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

course_modes

Reverification iOS support and refactor

2015-06-22 08:45:12 -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

TNL-2291 Add caching to discussion forum permissions

2015-06-17 21:08:28 +00:00

django_locale

Port django.middleware.locale.LocaleMiddleware from Django 1.8

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

edxmako

Make edxmako cache properly with changing lookup paths

2015-06-17 11:32:59 -04:00

embargo

XCOM-416: Embargo restrictions are now enforced during logistration

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

enrollment

LMS: Modification in enrollment API

2015-07-07 00:49:02 +05:00

external_auth

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

2015-07-02 18:44:10 +05: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

SOL-971

2015-06-10 19:26:30 +05:00

monitoring

Remove unused imports

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

monkey_patch

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

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

performance

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

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

pipeline_js

Unit page doesn't load when mathjax is down

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

pipeline_mako

TNL-2269 Compute language direction every time.

2015-05-28 16:13:59 -04:00

request_cache

Make RequestCache.clear_request_cache a classmethod

2015-06-15 09:50:44 -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 remote-tracking branch 'origin/release' into merge-release-into-master

2015-07-07 09:58:45 -07:00

terrain

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

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

third_party_auth

Fix errors with fetching Shibboleth metadata

2015-06-30 20:50:45 -07:00

track

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

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

util

Accept string-encoded timestamps

2015-06-25 13:18:30 -07: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