X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9bd36df8dcbc93164ea61d0736c69b361a7ced3d..4167e7083d75589e9dbbaa05bfcb43d27b60b42f:/src/wolnelektury/settings/__init__.py diff --git a/src/wolnelektury/settings/__init__.py b/src/wolnelektury/settings/__init__.py index 5d19d2651..54dca9c09 100644 --- a/src/wolnelektury/settings/__init__.py +++ b/src/wolnelektury/settings/__init__.py @@ -11,16 +11,6 @@ from .static import * from .paths import * -TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.contrib.auth.context_processors.auth', - 'django.core.context_processors.debug', - 'django.core.context_processors.i18n', - 'django.core.context_processors.media', - 'django.core.context_processors.request', - 'wolnelektury.context_processors.extra_settings', - 'search.context_processors.search_form', -) - MIDDLEWARE_CLASSES = [ 'django.middleware.csrf.CsrfViewMiddleware', 'ssify.middleware.SsiMiddleware', @@ -30,7 +20,7 @@ MIDDLEWARE_CLASSES = [ 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.admindocs.middleware.XViewMiddleware', - 'pagination.middleware.PaginationMiddleware', + 'fnp_django_pagination.middleware.PaginationMiddleware', 'ssify.middleware.LocaleMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', 'django.middleware.common.CommonMiddleware', @@ -67,7 +57,11 @@ INSTALLED_APPS_OUR = [ 'funding', 'polls', 'libraries', - ] + 'newsletter', + 'contact', + 'isbn', + 'paypal', +] GETPAID_BACKENDS = ( 'getpaid.backends.payu', @@ -85,7 +79,7 @@ INSTALLED_APPS_CONTRIB = [ 'django.contrib.admin', 'django.contrib.admindocs', 'django.contrib.staticfiles', - 'pagination', + 'fnp_django_pagination', 'pipeline', 'piston', 'piwik', @@ -97,6 +91,7 @@ INSTALLED_APPS_CONTRIB = [ 'getpaid.backends.payu', 'ssify', 'django_extensions', + 'raven.contrib.django.raven_compat', # allauth stuff 'uni_form', @@ -105,6 +100,7 @@ INSTALLED_APPS_CONTRIB = [ 'allauth.socialaccount', 'allauth.socialaccount.providers.openid', 'allauth.socialaccount.providers.facebook', + 'allauth.socialaccount.providers.google', # 'allauth.socialaccount.providers.twitter', ]