Merge remote-tracking branch 'origin/master' into l-autre-radio

[panikweb.git] / panikweb / settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index 5173478157c83445c214c42ca6ec2b11ddf435b3..7ccb32969a9c8a9014dd48793bfb28cb24ef38a7 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -138,12 +138,6 @@ TEMPLATES = [
 
 ROOT_URLCONF = 'panikweb.urls'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -156,6 +150,7 @@ INSTALLED_APPS = (
     'haystack',
     'taggit',
     'gadjo',
+    'panikdb.aa',
     'panikweb_templates',
     'panikweb.paniktags',
     'sorl.thumbnail',
@@ -252,6 +247,9 @@ WEBSITE_BASE_URL = 'http://www.radiopanik.org/'
 COMBO_INITIAL_LOGIN_PAGE_PATH = '/'
 COMBO_WELCOME_PAGE_PATH = None
 
+AUTH_USER_MODEL = 'aa.User'
+THUMBNAIL_PRESERVE_FORMAT = True
+
 try:
     from .local_settings import *
 except ImportError as e: