X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/62d83af2cafb15b3940311cf305a30d489909d95..e426e2dba8a5e280cda8074eb71f7bb43d8b1f40:/wolnelektury/settings/__init__.py?ds=inline diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index 7b1641c99..9224484de 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -20,26 +20,24 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.request', 'wolnelektury_core.context_processors.extra_settings', 'search.context_processors.search_form', - - "allauth.account.context_processors.account", - "allauth.socialaccount.context_processors.socialaccount", ) MIDDLEWARE_CLASSES = [ + 'django.middleware.csrf.CsrfViewMiddleware', + 'ssify.middleware.SsiMiddleware', 'django.middleware.cache.UpdateCacheMiddleware', + 'ssify.middleware.PrepareForCacheMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.middleware.doc.XViewMiddleware', + 'django.contrib.admindocs.middleware.XViewMiddleware', 'pagination.middleware.PaginationMiddleware', - 'django.middleware.locale.LocaleMiddleware', - 'piwik.django.middleware.PiwikMiddleware', + 'ssify.middleware.LocaleMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', 'django.middleware.common.CommonMiddleware', - 'django.middleware.cache.FetchFromCacheMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'fnpdjango.middleware.SetRemoteAddrFromXRealIP', + 'django.middleware.cache.FetchFromCacheMiddleware', ] ROOT_URLCONF = 'wolnelektury.urls' @@ -68,9 +66,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 +89,14 @@ INSTALLED_APPS_CONTRIB = [ 'pagination', 'pipeline', 'piston', - 'piwik.django', - #'rosetta', - 'south', + 'piwik', 'sorl.thumbnail', - 'djcelery', - 'djkombu', + 'kombu.transport.django', 'honeypot', - #'django_nose', 'fnpdjango', + 'getpaid', + 'getpaid.backends.payu', + 'ssify', #allauth stuff 'uni_form', @@ -100,9 +106,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