Kevin Falcone 80614a2798 Merge branch 'release' into hotfix-2015-11-20-conflict

2015-11-20 13:13:05 -05:00

..

auth_exchange

Rebase upgrade Django to v1.8.5

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

cache_toolbox

Rebase upgrade Django to v1.8.5

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

config_models

Rebase upgrade Django to v1.8.5

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

contentserver

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

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

cors_csrf

Rebase upgrade Django to v1.8.5

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

course_action_state

Rebase upgrade Django to v1.8.5

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

course_modes

Rebase upgrade Django to v1.8.5

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

dark_lang

More-correct data migrations

2015-11-11 09:03:21 -05:00

datadog

Remove dogstatsd-python in favor of dogapi

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

django_comment_common

Rebase upgrade Django to v1.8.5

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

edxmako

Rebase upgrade Django to v1.8.5

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

embargo

Rebase upgrade Django to v1.8.5

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

enrollment

Rebase upgrade Django to v1.8.5

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

external_auth

Rebase upgrade Django to v1.8.5

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

geoinfo

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

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

heartbeat

Rebase upgrade Django to v1.8.5

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

lang_pref

Rebase upgrade Django to v1.8.5

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

microsite_configuration

Fix staticfiles import in microsite.py.

2015-10-13 11:20:49 +02:00

monitoring

Eliminate instances of unused-import Pylint violation

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

monkey_patch

Rebase upgrade Django to v1.8.5

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

performance

Rebase upgrade Django to v1.8.5

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

pipeline_js

Use django.contrib.staticfiles instead of django-staticfiles.

2015-10-06 19:52:38 +05:00

pipeline_mako

Rebase upgrade Django to v1.8.5

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

request_cache

Revert "Merge DRF 3.1 in to master"

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

reverification

Rebase upgrade Django to v1.8.5

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

service_status

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05: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

Rebase upgrade Django to v1.8.5

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

status

Rebase upgrade Django to v1.8.5

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

student

Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts

2015-11-13 12:57:10 -05:00

terrain

Use django.contrib.staticfiles instead of django-staticfiles.

2015-10-06 19:52:38 +05:00

third_party_auth

Merge branch 'release' into hotfix-2015-11-20-conflict

2015-11-20 13:13:05 -05:00

track

Rebase upgrade Django to v1.8.5

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

util

resolve merge conflicts

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

xblock_django

Rebase upgrade Django to v1.8.5

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

xmodule_django

Rebase upgrade Django to v1.8.5

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