Andy Armstrong 60fab86f01 Reconcile double reverts ...

Resolves conflicts between reverts of pattern library test pages and multi-site comprehensive theming, and the re-introduction of pattern library test pages. Fixes a pipeline rendering test which relied on other tests updating assets. The test now ensures that static assets are available before running.

2016-04-14 23:28:55 -04:00

..

auth_exchange

Configure LMS to select oauth2 providing library.

2016-03-30 14:21:27 +00:00

cache_toolbox

Remove unused imports

2016-04-08 11:23:05 -04:00

config_models

Custom icons for third party auth login buttons

2016-04-06 12:50:55 -04:00

contentserver

Manually merge release into master

2016-04-14 14:23:06 -04:00

cors_csrf

Remove useless pylint suppressions

2015-11-22 07:41:19 -05:00

course_action_state

Rebase upgrade Django to v1.8.5

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

course_modes

Manually merge release into master

2016-04-14 14:23:06 -04:00

dark_lang

Remove uses of using() from migrations

2016-02-01 16:57:26 -05:00

datadog

Remove dogstatsd-python in favor of dogapi

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

django_comment_common

Remove useless pylint suppressions

2015-11-22 07:41:19 -05:00

edxmako

Manually merge release into master

2016-04-14 14:23:06 -04:00

embargo

Remove unused imports

2016-04-08 11:23:05 -04:00

enrollment

Enroll already-existing user to a course via management command.

2016-01-27 11:49:31 -05:00

external_auth

Fixed 500 error in case of user's profile not found when login/logout with CAS

2016-04-05 22:49:05 +05:00

geoinfo

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

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

header_control

Switch to header_control in contentserver.

2016-03-07 18:51:14 -05:00

heartbeat

Rebase upgrade Django to v1.8.5

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

lang_pref

Translate available preferred languages in user account settings

2016-04-04 10:33:00 +02:00

microsite_configuration

Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"

2016-04-12 08:22:14 -04:00

monitoring

Eliminate instances of unused-import Pylint violation

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

monkey_patch

Upgrade to Django 1.8.11. Remove monkey patch required for v1.8.10.

2016-03-08 11:41:33 -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

Reconcile double reverts

2016-04-14 23:28:55 -04: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

Fix up the excluded extensions bit.

2016-02-05 12:14:15 -05:00

status

Remove unused imports

2016-04-08 11:23:05 -04:00

student

Manually merge release into master

2016-04-14 14:23:06 -04:00

terrain

Merge pull request #11363 from edx/notes-pagination

2016-03-10 17:26:54 +05:00

third_party_auth

Remove unused imports

2016-04-08 11:23:05 -04:00

track

Add latin1 decoding to HTTP Headers

2016-03-08 12:44:55 +05:00

util

Make migrations in-sync with models

2016-04-07 12:26:18 +05:00

xblock_django

[TNL-3962] moving DEPRECATED_ADVANCED_COMPONENT_TYPES to dJango admin

2016-02-08 17:26:49 +05:00

xmodule_django

Rebase upgrade Django to v1.8.5

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