X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/631e1c32e1c23b24eda0c747f6bbd30cb394b791..51c6366416694fe151fdcea3d9da7a06a08f7ef1:/src/redakcja/settings/__init__.py?ds=inline diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py index ecebe40e..61a80c87 100644 --- a/src/redakcja/settings/__init__.py +++ b/src/redakcja/settings/__init__.py @@ -106,6 +106,7 @@ INSTALLED_APPS = ( 'email_mangler', 'wlxml.apps.WlxmlConfig', 'alerts', + 'team', ) if DEBUG: @@ -124,6 +125,8 @@ LEGIMI_BIG_WORDS = 10000 LEGIMI_SMALL_PRICE = 7 LEGIMI_BIG_PRICE = 20 +THUMBNAIL_PRESERVE_FORMAT = True + STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', @@ -136,21 +139,21 @@ PIPELINE = { 'CSS_COMPRESSOR': None, 'JS_COMPRESSOR': None, 'COMPILERS': ( - 'pipeline.compilers.sass.SASSCompiler', + 'libsasscompiler.LibSassCompiler', ), # CSS and JS files to compress 'STYLESHEETS': { 'detail': { 'source_filenames': ( + 'css/html.scss', 'css/master.css', 'css/toolbar.css', 'css/gallery.css', 'css/history.css', 'css/summary.css', - 'css/html.scss', 'css/imgareaselect-default.css', - 'css/dialogs.css', + 'css/dialogs.scss', 'wiki/scss/splitter.scss', 'wiki/scss/visual.scss' @@ -195,8 +198,9 @@ PIPELINE = { # base UI 'js/wiki/base.js', - 'wiki/js/sidebar-perspective.js', 'js/wiki/toolbar.js', + 'js/lib/diff.js', + 'js/wiki/undo.js', # dialogs 'js/wiki/dialog_save.js', @@ -204,6 +208,7 @@ PIPELINE = { 'js/wiki/dialog_pubmark.js', # views + 'js/wiki/view_sidebar.js', 'js/wiki/view_history.js', 'js/wiki/view_summary.js', 'js/wiki/view_editor_source.js',