Clinton Blackburn f967cfce8b Merged release to master ...

Resolved conflicts from hotfix-2015-10-05

2015-10-05 14:46:32 -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

Revert "Merge DRF 3.1 in to master"

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

course_action_state

Remove superfluous-parens pylint violations

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

course_modes

If enrollment mode is credit then upgrade message should not appear.

2015-09-29 20:56:32 +05:00

dark_lang

Dark lang middleware: Check if user is authenticated

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

datadog

…

django_comment_common

Add signals for user's discussion activity.

2015-08-26 12:07:54 -04:00

django_locale

Port django.middleware.locale.LocaleMiddleware from Django 1.8

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

edxmako

Minor changes, responding to pull request comments

2015-09-17 15:39:03 -04:00

embargo

fixed snapshot functionality for RestrictedCrouse embargo, select_related is now passed the proper hint. TNL-3452

2015-10-01 13:50:46 -04:00

enrollment

Updates the description provided for a new enrollment report

2015-10-01 16:28:42 -04:00

external_auth

Convert Shib external auth test to use SharedModuleStoreTestCase.

2015-08-25 08:56:16 -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

favicon display bug corrected

2015-10-02 18:15:49 +05:00

monitoring

Eliminate instances of unused-import Pylint violation

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

monkey_patch

Fix Pylint warning for monkey_patch tests

2015-09-09 09:13:29 -04:00

performance

Eliminate instances of unused-import Pylint violation

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

pipeline_js

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

2015-10-02 18:26:25 +05:00

pipeline_mako

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

2015-10-02 18:26:25 +05:00

request_cache

Revert "Merge DRF 3.1 in to master"

2015-09-28 17:12:43 -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

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

2015-10-02 18:26:25 +05:00

status

Make status use ConfigurationModel instead.

2015-08-11 17:51:39 -04:00

student

Merged release to master

2015-10-05 14:46:32 -04:00

terrain

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

2015-10-02 18:26:25 +05:00

third_party_auth

Rename SEGMENT_KEY to have a unique key name for both CMS and LMS

2015-10-01 19:40:27 -04:00

track

Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY

2015-09-24 11:49:03 -04:00

util

date format "Monday at 3pm UTC" added for courses starting with-in 5 days

2015-09-23 12:17:08 +05:00

xblock_django

Adding django command to create mongodb indexes

2015-08-17 17:05:27 -04:00

xmodule_django

Remove unused imports

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