X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/62d83af2cafb15b3940311cf305a30d489909d95..08433423130c027b64c87c13c1bb4d2390694263:/wolnelektury/settings/__init__.py?ds=sidebyside diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index 7b1641c99..7c3787c83 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -26,7 +26,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( ) MIDDLEWARE_CLASSES = [ - 'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -34,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', ] @@ -68,9 +65,18 @@ INSTALLED_APPS_OUR = [ 'search', 'oai', 'funding', + 'polls', + 'libraries', ] +GETPAID_BACKENDS = ( + 'getpaid.backends.payu', +) + INSTALLED_APPS_CONTRIB = [ + # Should be before django.contrib.admin + 'modeltranslation', + # external 'django.contrib.auth', 'django.contrib.contenttypes', @@ -82,15 +88,17 @@ INSTALLED_APPS_CONTRIB = [ 'pagination', 'pipeline', 'piston', - 'piwik.django', + 'piwik', #'rosetta', - 'south', + #'south', 'sorl.thumbnail', 'djcelery', - 'djkombu', + 'kombu.transport.django', 'honeypot', #'django_nose', 'fnpdjango', + 'getpaid', + 'getpaid.backends.payu', #allauth stuff 'uni_form', @@ -100,9 +108,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