X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c26ab6ee15974c1133a6d08c459b51199185f25f..46a90d7cfe54bb6df2f99175abd0ad7d26b3da72:/wolnelektury/settings/__init__.py?ds=inline diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index 4d8b81b9c..db6ba4584 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -6,6 +6,7 @@ from settings.basic import * from settings.auth import * from settings.cache import * from settings.celery import * +from settings.contrib import * from settings.custom import * from settings.locale import * from settings.static import * @@ -27,6 +28,7 @@ MIDDLEWARE_CLASSES = [ 'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.middleware.doc.XViewMiddleware', 'pagination.middleware.PaginationMiddleware', @@ -40,7 +42,32 @@ MIDDLEWARE_CLASSES = [ ROOT_URLCONF = 'wolnelektury.urls' -INSTALLED_APPS = [ +# These are the ones we should test. +INSTALLED_APPS_OUR = [ + 'wolnelektury_core', + # our + 'ajaxable', + 'api', + 'catalogue', + 'chunks', + 'dictionary', + 'infopages', + 'lesmianator', + 'newtagging', + 'opds', + 'pdcounter', + 'reporting', + 'sponsors', + 'stats', + 'suggest', + 'picture', + 'social', + 'waiter', + 'search', + 'oai', + ] + +INSTALLED_APPS_CONTRIB = [ # external 'django.contrib.auth', 'django.contrib.contenttypes', @@ -48,7 +75,9 @@ INSTALLED_APPS = [ 'django.contrib.sites', 'django.contrib.admin', 'django.contrib.admindocs', + 'django.contrib.staticfiles', 'pagination', + 'pipeline', 'piston', 'piwik.django', #'rosetta', @@ -56,7 +85,8 @@ INSTALLED_APPS = [ 'sorl.thumbnail', 'djcelery', 'djkombu', - # 'django_nose', + 'honeypot', + #'django_nose', #allauth stuff 'emailconfirmation', @@ -69,30 +99,10 @@ INSTALLED_APPS = [ #'allauth.twitter', # included - 'compress', 'modeltranslation', + ] - # our - 'wolnelektury_core', - 'ajaxable', - 'api', - 'catalogue', - 'chunks', - 'dictionary', - 'infopages', - 'lesmianator', - #'lessons', - 'newtagging', - 'opds', - 'pdcounter', - 'reporting', - 'sponsors', - 'stats', - 'suggest', - 'picture', - 'search', - 'social', -] +INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB # Load localsettings, if they exist try: