Added "merge_url" to document meta-data.

[redakcja.git] / project / settings.py

diff --git a/project/settings.py b/project/settings.py
index 22d9bdd..0551819 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -66,7 +66,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
+    "explorer.context_processors.settings",
     "django.core.context_processors.request",
 )
 
@@ -77,12 +77,14 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'explorer.middleware.EditorSettingsMiddleware',
     'django.middleware.doc.XViewMiddleware',
+
+    'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
-    PROJECT_ROOT + '/templates'
+    PROJECT_ROOT + '/templates',    
 )
 
 # CSS and JS files to compress
@@ -113,6 +115,8 @@ INSTALLED_APPS = (
     
     'explorer',
     'toolbar',
+    'api',
+    'wysiwyg',
 )