X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e9f8a9269b64a5af7c95d6c2714b1ae97e68d6a1..c6939b2a92556332eaab2cbbfd61a0e6798091c7:/wolnelektury/settings/__init__.py diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index 335b2b1aa..8d7c00f82 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -20,12 +20,12 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.request', 'wolnelektury_core.context_processors.extra_settings', 'search.context_processors.search_form', - "allauth.context_processors.allauth", + "allauth.account.context_processors.account", + "allauth.socialaccount.context_processors.socialaccount", ) MIDDLEWARE_CLASSES = [ - 'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -36,7 +36,6 @@ MIDDLEWARE_CLASSES = [ 'piwik.django.middleware.PiwikMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', 'django.middleware.common.CommonMiddleware', - 'django.middleware.cache.FetchFromCacheMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'fnpdjango.middleware.SetRemoteAddrFromXRealIP', ] @@ -66,8 +65,15 @@ INSTALLED_APPS_OUR = [ 'waiter', 'search', 'oai', + 'funding', + 'polls', + 'libraries', ] +GETPAID_BACKENDS = ( + 'getpaid.backends.payu', +) + INSTALLED_APPS_CONTRIB = [ # external 'django.contrib.auth', @@ -88,16 +94,18 @@ INSTALLED_APPS_CONTRIB = [ 'djkombu', 'honeypot', #'django_nose', + 'fnpdjango', + 'getpaid', + 'getpaid.backends.payu', #allauth stuff - 'emailconfirmation', 'uni_form', 'allauth', 'allauth.account', 'allauth.socialaccount', - 'allauth.openid', - #'allauth.facebook', - #'allauth.twitter', + 'allauth.socialaccount.providers.openid', + 'allauth.socialaccount.providers.facebook', + #'allauth.socialaccount.providers.twitter', # included 'modeltranslation',