+Change.author_desc, minor changes

[redakcja.git] / redakcja / settings / common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 0a3b376..587374b 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+from __future__ import absolute_import

 import os.path
 
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 import os.path
 
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))


@@ -10,7 +11,8 @@ MAINTENANCE_MODE = False
 
 ADMINS = (
     # (u'Marek Stępniowski', 'marek@stepniowski.com'),
 
 ADMINS = (
     # (u'Marek Stępniowski', 'marek@stepniowski.com'),

-    (u'Łukasz Rekucki', 'lrekucki@gmail.com'),
+    # (u'Łukasz Rekucki', 'lrekucki@gmail.com'),
+    (u'Radek Czajka', 'radoslaw.czajka@nowoczesnapolska.org.pl'),

 )
 
 MANAGERS = ADMINS
 )
 
 MANAGERS = ADMINS


@@ -66,7 +68,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",

-    "redakcja.context_processors.settings", # this is instead of media 
+    "redakcja.context_processors.settings", # this is instead of media

     "django.core.context_processors.request",
 )
 
     "django.core.context_processors.request",
 )
 


@@ -102,8 +104,6 @@ FIREPYTHON_LOGGER_NAME = "fnp"
 # CAS_SERVER_URL = "http://cas.fnp.pl/
 CAS_LOGOUT_COMPLETELY = True
 
 # CAS_SERVER_URL = "http://cas.fnp.pl/
 CAS_LOGOUT_COMPLETELY = True
 

-from compress_settings import *
-

 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',


@@ -117,6 +117,7 @@ INSTALLED_APPS = (
     'south',
     'sorl.thumbnail',
     'filebrowser',
     'south',
     'sorl.thumbnail',
     'filebrowser',

+    'dvcs',

 
     'wiki',
     'toolbar',
 
     'wiki',
     'toolbar',


@@ -139,4 +140,10 @@ WL_API_CONFIG = {
     "AUTH_PASSWD": "platforma",
 }
 
     "AUTH_PASSWD": "platforma",
 }
 

-# Import localsettings file, which may override settings defined here
+SHOW_APP_VERSION = False
+
+try:
+    from redakcja.settings.compress import *
+except ImportError:
+    pass
+