X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/8f0e18f498d6c07937c92d186bfa6b654a1afa14..refs/heads/backend-rewrite:/redakcja/settings/common.py diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py index 0a3b3765..ca38a93a 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__))) @@ -66,7 +67,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", ) @@ -102,8 +103,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,6 +116,9 @@ INSTALLED_APPS = ( 'south', 'sorl.thumbnail', 'filebrowser', + 'eav', + 'dvcs', + 'dcmeta', 'wiki', 'toolbar', @@ -139,4 +141,10 @@ WL_API_CONFIG = { "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 +