Fixes #4204: use div instead of p in visual editor to prevent nesting issues.

[redakcja.git] / src / redakcja / settings / __init__.py

diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py
index 8b7b9c4..c7cf324 100644 (file)
--- a/src/redakcja/settings/__init__.py
+++ b/src/redakcja/settings/__init__.py
@@ -76,6 +76,7 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.sites',

+    'admin_numeric_filter',

     'django.contrib.admin',
     'django.contrib.admindocs',
 
     'django.contrib.admin',
     'django.contrib.admindocs',
 


@@ -102,6 +103,10 @@ INSTALLED_APPS = (
 if DEBUG:
     INSTALLED_APPS += ('debug_toolbar',)
 
 if DEBUG:
     INSTALLED_APPS += ('debug_toolbar',)
 

+LOCALE_PATHS = [
+    PROJECT_ROOT + "/locale-contrib",
+]
+

 LOGIN_REDIRECT_URL = '/documents/user'
 
 MIN_COVER_SIZE = (915, 1270)
 LOGIN_REDIRECT_URL = '/documents/user'
 
 MIN_COVER_SIZE = (915, 1270)


@@ -191,6 +196,7 @@ PIPELINE = {
                 'js/wiki/view_editor_wysiwyg.js',
                 'js/wiki/view_gallery.js',
                 'js/wiki/view_annotations.js',
                 'js/wiki/view_editor_wysiwyg.js',
                 'js/wiki/view_gallery.js',
                 'js/wiki/view_annotations.js',

+                'js/wiki/view_properties.js',

                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
             ),
                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
             ),