X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0dff76ecd927e5be83d8a6076f84c87c5dea4a4c..80b56e4c5f668a8011bdf859504d45b7b7f6d914:/wolnelektury/settings/__init__.py?ds=sidebyside diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index e8a56071f..e5c7ece10 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -2,14 +2,14 @@ # 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.contrib 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 = ( @@ -20,8 +20,9 @@ TEMPLATE_CONTEXT_PROCESSORS = ( '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.socialaccount.context_processors.socialaccount", ) MIDDLEWARE_CLASSES = [ @@ -66,6 +67,7 @@ INSTALLED_APPS_OUR = [ 'waiter', 'search', 'oai', + 'libraries', ] INSTALLED_APPS_CONTRIB = [ @@ -90,14 +92,13 @@ INSTALLED_APPS_CONTRIB = [ #'django_nose', #allauth stuff - 'emailconfirmation', '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 'modeltranslation', @@ -107,7 +108,6 @@ INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB # Load localsettings, if they exist try: - from localsettings import * + from wolnelektury.localsettings import * except ImportError: pass -