fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug with related tags and object display when tag spanned both books and pictures
[wolnelektury.git]
/
wolnelektury
/
settings
/
__init__.py
diff --git
a/wolnelektury/settings/__init__.py
b/wolnelektury/settings/__init__.py
index
4d8b81b
..
8d7c00f
100644
(file)
--- a/
wolnelektury/settings/__init__.py
+++ b/
wolnelektury/settings/__init__.py
@@
-2,13
+2,14
@@
# Django settings for wolnelektury project.
from os import path
# Django settings for wolnelektury project.
from os import path
-from settings.basic import *
-from settings.auth import *
-from settings.cache import *
-from settings.celery import *
-from settings.custom import *
-from settings.locale import *
-from settings.static import *
+from .basic import *
+from .auth import *
+from .cache import *
+from .celery import *
+from .contrib import *
+from .custom import *
+from .locale import *
+from .static import *
TEMPLATE_CONTEXT_PROCESSORS = (
TEMPLATE_CONTEXT_PROCESSORS = (
@@
-19,14
+20,15
@@
TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.request',
'wolnelektury_core.context_processors.extra_settings',
'search.context_processors.search_form',
'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.account.context_processors.account",
+ "allauth.socialaccount.context_processors.socialaccount",
)
MIDDLEWARE_CLASSES = [
)
MIDDLEWARE_CLASSES = [
- 'django.middleware.cache.UpdateCacheMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'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',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.doc.XViewMiddleware',
'pagination.middleware.PaginationMiddleware',
@@
-34,13
+36,45
@@
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',
'django.contrib.messages.middleware.MessageMiddleware',
+ 'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
]
ROOT_URLCONF = 'wolnelektury.urls'
]
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',
+ 'funding',
+ 'polls',
+ 'libraries',
+ ]
+
+GETPAID_BACKENDS = (
+ 'getpaid.backends.payu',
+)
+
+INSTALLED_APPS_CONTRIB = [
# external
'django.contrib.auth',
'django.contrib.contenttypes',
# external
'django.contrib.auth',
'django.contrib.contenttypes',
@@
-48,7
+82,9
@@
INSTALLED_APPS = [
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
+ 'django.contrib.staticfiles',
'pagination',
'pagination',
+ 'pipeline',
'piston',
'piwik.django',
#'rosetta',
'piston',
'piwik.django',
#'rosetta',
@@
-56,47
+92,29
@@
INSTALLED_APPS = [
'sorl.thumbnail',
'djcelery',
'djkombu',
'sorl.thumbnail',
'djcelery',
'djkombu',
- # 'django_nose',
+ 'honeypot',
+ #'django_nose',
+ 'fnpdjango',
+ 'getpaid',
+ 'getpaid.backends.payu',
#allauth stuff
#allauth stuff
- 'emailconfirmation',
'uni_form',
'allauth',
'allauth.account',
'allauth.socialaccount',
'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
# included
- 'compress',
'modeltranslation',
'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:
# Load localsettings, if they exist
try:
- from localsettings import *
+ from
wolnelektury.
localsettings import *
except ImportError:
pass
except ImportError:
pass
-