X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/2d0cc46d3bc3357c19d13fc585c0a9492e5ee1b7..0a0c8c042ae705677b4e8b81445f6d89803dc06b:/wolnelektury/settings/__init__.py?ds=sidebyside diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index bce9bd399..4f6194096 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -26,17 +26,21 @@ TEMPLATE_CONTEXT_PROCESSORS = ( ) MIDDLEWARE_CLASSES = [ + 'django.middleware.csrf.CsrfViewMiddleware', + 'ssify.middleware.SsiMiddleware', + 'django.middleware.cache.UpdateCacheMiddleware', + 'ssify.middleware.PrepareForCacheMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.middleware.doc.XViewMiddleware', + 'django.contrib.admindocs.middleware.XViewMiddleware', 'pagination.middleware.PaginationMiddleware', - 'django.middleware.locale.LocaleMiddleware', + 'ssify.middleware.LocaleMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'fnpdjango.middleware.SetRemoteAddrFromXRealIP', + 'django.middleware.cache.FetchFromCacheMiddleware', ] ROOT_URLCONF = 'wolnelektury.urls' @@ -74,6 +78,9 @@ GETPAID_BACKENDS = ( ) INSTALLED_APPS_CONTRIB = [ + # Should be before django.contrib.admin + 'modeltranslation', + # external 'django.contrib.auth', 'django.contrib.contenttypes', @@ -86,16 +93,13 @@ INSTALLED_APPS_CONTRIB = [ 'pipeline', 'piston', 'piwik', - #'rosetta', - 'south', 'sorl.thumbnail', - 'djcelery', 'kombu.transport.django', 'honeypot', - #'django_nose', 'fnpdjango', 'getpaid', 'getpaid.backends.payu', + 'ssify', #allauth stuff 'uni_form', @@ -105,9 +109,6 @@ INSTALLED_APPS_CONTRIB = [ 'allauth.socialaccount.providers.openid', 'allauth.socialaccount.providers.facebook', #'allauth.socialaccount.providers.twitter', - - # included - 'modeltranslation', ] INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB