X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/7100b7600042ac22687fb3036547841578b7e512..8830e06ad0b466c40747540b5122e6825114a90a:/redakcja/settings/common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 377a4d50..36c54b00 100644
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import
 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'),
-    (u'Łukasz Rekucki', 'lrekucki@gmail.com'),
+    # (u'Łukasz Rekucki', 'lrekucki@gmail.com'),
+    (u'Radek Czajka', 'radoslaw.czajka@nowoczesnapolska.org.pl'),
 )
 
 MANAGERS = ADMINS
@@ -66,7 +68,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "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",
 )
 
@@ -79,6 +81,7 @@ MIDDLEWARE_CLASSES = (
     'django_cas.middleware.CASMiddleware',
 
     'django.middleware.doc.XViewMiddleware',
+    'pagination.middleware.PaginationMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 
@@ -102,8 +105,6 @@ FIREPYTHON_LOGGER_NAME = "fnp"
 # CAS_SERVER_URL = "http://cas.fnp.pl/
 CAS_LOGOUT_COMPLETELY = True
 
-from compress_settings import *
-
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -117,9 +118,12 @@ INSTALLED_APPS = (
     'south',
     'sorl.thumbnail',
     'filebrowser',
+    'pagination',
 
+    'dvcs',
     'wiki',
     'toolbar',
+    'apiclient',
 )
 
 FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
@@ -139,17 +143,10 @@ WL_API_CONFIG = {
     "AUTH_PASSWD": "platforma",
 }
 
-# Import localsettings file, which may override settings defined here
-
-from localsettings import *
+SHOW_APP_VERSION = False
 
 try:
-    import logging
-    if os.path.isfile(LOGGING_CONFIG_FILE):
-        import logging.config
-        logging.config.fileConfig(LOGGING_CONFIG_FILE)
-    else:
-        import sys
-        logging.basicConfig(stream=sys.stderr)
-except ImportError as exc:
-    raise
+    from redakcja.settings.compress import *
+except ImportError:
+    pass
+