Merge branch 'obrazy' into rwd

[wolnelektury.git] / wolnelektury / settings / __init__.py

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index 1c743e5..8d7c00f 100644 (file)
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -26,7 +26,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 MIDDLEWARE_CLASSES = [
 )
 
 MIDDLEWARE_CLASSES = [

-    'django.middleware.cache.UpdateCacheMiddleware',

     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',


@@ -37,7 +36,6 @@ MIDDLEWARE_CLASSES = [
     'piwik.django.middleware.PiwikMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'piwik.django.middleware.PiwikMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',

-    'django.middleware.cache.FetchFromCacheMiddleware',

     'django.contrib.messages.middleware.MessageMiddleware',
     'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
 ]
     'django.contrib.messages.middleware.MessageMiddleware',
     'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
 ]


@@ -68,8 +66,14 @@ INSTALLED_APPS_OUR = [
     'search',
     'oai',
     'funding',
     'search',
     'oai',
     'funding',

+    'polls',
+    'libraries',

     ]
 
     ]
 

+GETPAID_BACKENDS = (
+    'getpaid.backends.payu',
+)
+

 INSTALLED_APPS_CONTRIB = [
     # external
     'django.contrib.auth',
 INSTALLED_APPS_CONTRIB = [
     # external
     'django.contrib.auth',


@@ -90,6 +94,9 @@ INSTALLED_APPS_CONTRIB = [
     'djkombu',
     'honeypot',
     #'django_nose',
     'djkombu',
     'honeypot',
     #'django_nose',

+    'fnpdjango',
+    'getpaid',
+    'getpaid.backends.payu',

 
     #allauth stuff
     'uni_form',
 
     #allauth stuff
     'uni_form',