fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove non-ascii chars from SCSS to keep pipeline from tripping.
[redakcja.git]
/
src
/
redakcja
/
settings
/
__init__.py
diff --git
a/src/redakcja/settings/__init__.py
b/src/redakcja/settings/__init__.py
index
67be05b
..
db606b8
100644
(file)
--- a/
src/redakcja/settings/__init__.py
+++ b/
src/redakcja/settings/__init__.py
@@
-1,9
+1,14
@@
+# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
import os.path
import sentry_sdk
from sentry_sdk.integrations.django import DjangoIntegration
from .defaults import *
from ..localsettings import *
import os.path
import sentry_sdk
from sentry_sdk.integrations.django import DjangoIntegration
from .defaults import *
from ..localsettings import *
+DATA_UPLOAD_MAX_MEMORY_SIZE = 20000000
+
PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
STATICFILES_DIRS = [
PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
STATICFILES_DIRS = [
@@
-74,6
+79,7
@@
INSTALLED_APPS = (
'pipeline',
'fnpdjango',
'django_cas_ng',
'pipeline',
'fnpdjango',
'django_cas_ng',
+ 'bootstrap4',
'catalogue',
'cover',
'catalogue',
'cover',
@@
-103,6
+109,9
@@
STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
PIPELINE = {
'CSS_COMPRESSOR': None,
'JS_COMPRESSOR': None,
PIPELINE = {
'CSS_COMPRESSOR': None,
'JS_COMPRESSOR': None,
+ 'COMPILERS': (
+ 'libsasscompiler.LibSassCompiler',
+ ),
# CSS and JS files to compress
'STYLESHEETS': {
# CSS and JS files to compress
'STYLESHEETS': {
@@
-114,9
+123,11
@@
PIPELINE = {
'css/history.css',
'css/summary.css',
'css/html.css',
'css/history.css',
'css/summary.css',
'css/html.css',
- 'css/jquery.autocomplete.css',
'css/imgareaselect-default.css',
'css/dialogs.css',
'css/imgareaselect-default.css',
'css/dialogs.css',
+
+ 'wiki/scss/splitter.scss',
+ 'wiki/scss/visual.scss'
),
'output_filename': 'compressed/detail_styles.css',
},
),
'output_filename': 'compressed/detail_styles.css',
},
@@
-125,8
+136,8
@@
PIPELINE = {
'css/filelist.css',
),
'output_filename': 'compressed/catalogue_styles.css',
'css/filelist.css',
),
'output_filename': 'compressed/catalogue_styles.css',
-
},
-
'book': {
+ },
+ 'book': {
'source_filenames': (
'css/book.css',
),
'source_filenames': (
'css/book.css',
),
@@
-134,7
+145,6
@@
PIPELINE = {
},
'book_list': {
'source_filenames': (
},
'book_list': {
'source_filenames': (
- 'contextmenu/jquery.contextMenu.css',
'css/book_list.css',
),
'output_filename': 'compressed/book_list.css',
'css/book_list.css',
),
'output_filename': 'compressed/book_list.css',
@@
-145,7
+155,6
@@
PIPELINE = {
'detail': {
'source_filenames': (
# libraries
'detail': {
'source_filenames': (
# libraries
- 'js/lib/jquery/jquery.autocomplete.js',
'js/lib/jquery/jquery.blockui.js',
'js/lib/jquery/jquery.elastic.js',
'js/lib/jquery/jquery.xmlns.js',
'js/lib/jquery/jquery.blockui.js',
'js/lib/jquery/jquery.elastic.js',
'js/lib/jquery/jquery.xmlns.js',
@@
-154,10
+163,12
@@
PIPELINE = {
# wiki scripts
'js/wiki/wikiapi.js',
# wiki scripts
'js/wiki/wikiapi.js',
+ 'wiki/js/themes.js',
'js/wiki/xslt.js',
# base UI
'js/wiki/base.js',
'js/wiki/xslt.js',
# base UI
'js/wiki/base.js',
+ 'wiki/js/sidebar-perspective.js',
'js/wiki/toolbar.js',
# dialogs
'js/wiki/toolbar.js',
# dialogs
@@
-176,12
+187,10
@@
PIPELINE = {
'js/wiki/view_column_diff.js',
),
'output_filename': 'compressed/detail_scripts.js',
'js/wiki/view_column_diff.js',
),
'output_filename': 'compressed/detail_scripts.js',
-
},
+ },
'wiki_img': {
'source_filenames': (
# libraries
'wiki_img': {
'source_filenames': (
# libraries
- 'js/lib/jquery-1.4.2.min.js',
- 'js/lib/jquery/jquery.autocomplete.js',
'js/lib/jquery/jquery.blockui.js',
'js/lib/jquery/jquery.elastic.js',
'js/lib/jquery/jquery.imgareaselect.js',
'js/lib/jquery/jquery.blockui.js',
'js/lib/jquery/jquery.elastic.js',
'js/lib/jquery/jquery.imgareaselect.js',
@@
-190,6
+199,7
@@
PIPELINE = {
# wiki scripts
'js/wiki_img/wikiapi.js',
# wiki scripts
'js/wiki_img/wikiapi.js',
+ 'wiki/js/themes.js',
# base UI
'js/wiki_img/base.js',
# base UI
'js/wiki_img/base.js',
@@
-208,7
+218,7
@@
PIPELINE = {
'js/wiki/view_column_diff.js',
),
'output_filename': 'compressed/detail_img_scripts.js',
'js/wiki/view_column_diff.js',
),
'output_filename': 'compressed/detail_img_scripts.js',
-
},
+ },
'catalogue': {
'source_filenames': (
'js/catalogue/catalogue.js',
'catalogue': {
'source_filenames': (
'js/catalogue/catalogue.js',
@@
-216,8
+226,8
@@
PIPELINE = {
'email_mangler/email_mangler.js',
),
'output_filename': 'compressed/catalogue_scripts.js',
'email_mangler/email_mangler.js',
),
'output_filename': 'compressed/catalogue_scripts.js',
-
},
-
'book': {
+ },
+ 'book': {
'source_filenames': (
'js/book_text/jquery.eventdelegation.js',
'js/book_text/jquery.scrollto.js',
'source_filenames': (
'js/book_text/jquery.eventdelegation.js',
'js/book_text/jquery.scrollto.js',
@@
-228,8
+238,6
@@
PIPELINE = {
},
'book_list': {
'source_filenames': (
},
'book_list': {
'source_filenames': (
- 'contextmenu/jquery.ui.position.js',
- 'contextmenu/jquery.contextMenu.js',
'js/catalogue/book_list.js',
),
'output_filename': 'compressed/book_list.js',
'js/catalogue/book_list.js',
),
'output_filename': 'compressed/book_list.js',
@@
-238,6
+246,9
@@
PIPELINE = {
}
}
+SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
+
+
try:
SENTRY_DSN
except NameError:
try:
SENTRY_DSN
except NameError:
@@
-247,4
+258,3
@@
else:
dsn=SENTRY_DSN,
integrations=[DjangoIntegration()]
)
dsn=SENTRY_DSN,
integrations=[DjangoIntegration()]
)
-