X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/640e6f5c1e85d05d728cd29a129df9ea8aa8f31f..7fdf8249c9c016e397edc3112184e74b0f3f9778:/wolnelektury/settings/__init__.py

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index 335b2b1aa..c40bb366b 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',
@@ -33,10 +33,8 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'django.middleware.locale.LocaleMiddleware',
-    '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 +64,15 @@ INSTALLED_APPS_OUR = [
     'waiter',
     'search',
     'oai',
+    'funding',
+    'polls',
+    'libraries',
     ]
 
+GETPAID_BACKENDS = (
+    'getpaid.backends.payu',
+)
+
 INSTALLED_APPS_CONTRIB = [
     # external
     'django.contrib.auth',
@@ -80,7 +85,7 @@ INSTALLED_APPS_CONTRIB = [
     'pagination',
     'pipeline',
     'piston',
-    'piwik.django',
+    'piwik',
     #'rosetta',
     'south',
     'sorl.thumbnail',
@@ -88,16 +93,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',