fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Error handling fix.
[redakcja.git]
/
src
/
redakcja
/
settings
/
__init__.py
diff --git
a/src/redakcja/settings/__init__.py
b/src/redakcja/settings/__init__.py
index
4259b31
..
61a80c8
100644
(file)
--- a/
src/redakcja/settings/__init__.py
+++ b/
src/redakcja/settings/__init__.py
@@
-53,7
+53,6
@@
if CAS_SERVER_URL:
MIDDLEWARE += [
'django.contrib.admindocs.middleware.XViewMiddleware',
'fnp_django_pagination.middleware.PaginationMiddleware',
MIDDLEWARE += [
'django.contrib.admindocs.middleware.XViewMiddleware',
'fnp_django_pagination.middleware.PaginationMiddleware',
- 'maintenancemode.middleware.MaintenanceModeMiddleware',
]
if DEBUG:
]
if DEBUG:
@@
-70,6
+69,8
@@
if CAS_SERVER_URL:
ROOT_URLCONF = 'redakcja.urls'
INSTALLED_APPS = (
ROOT_URLCONF = 'redakcja.urls'
INSTALLED_APPS = (
+ 'modeltranslation',
+
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
@@
-90,9
+91,11
@@
INSTALLED_APPS = (
'bootstrap4',
'rest_framework',
'django_filters',
'bootstrap4',
'rest_framework',
'django_filters',
+ 'admin_ordering',
'redakcja.api',
'catalogue',
'redakcja.api',
'catalogue',
+ 'depot',
'documents',
'cover',
'dvcs',
'documents',
'cover',
'dvcs',
@@
-102,6
+105,8
@@
INSTALLED_APPS = (
'apiclient',
'email_mangler',
'wlxml.apps.WlxmlConfig',
'apiclient',
'email_mangler',
'wlxml.apps.WlxmlConfig',
+ 'alerts',
+ 'team',
)
if DEBUG:
)
if DEBUG:
@@
-115,6
+120,13
@@
LOGIN_REDIRECT_URL = '/documents/user'
MIN_COVER_SIZE = (915, 1270)
MIN_COVER_SIZE = (915, 1270)
+LEGIMI_SMALL_WORDS = 2000
+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',
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
@@
-127,21
+139,21
@@
PIPELINE = {
'CSS_COMPRESSOR': None,
'JS_COMPRESSOR': None,
'COMPILERS': (
'CSS_COMPRESSOR': None,
'JS_COMPRESSOR': None,
'COMPILERS': (
- '
pipeline.compilers.sass.SASS
Compiler',
+ '
libsasscompiler.LibSass
Compiler',
),
# CSS and JS files to compress
'STYLESHEETS': {
'detail': {
'source_filenames': (
),
# 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/master.css',
'css/toolbar.css',
'css/gallery.css',
'css/history.css',
'css/summary.css',
- 'css/html.scss',
'css/imgareaselect-default.css',
'css/imgareaselect-default.css',
- 'css/dialogs.css',
+ 'css/dialogs.
s
css',
'wiki/scss/splitter.scss',
'wiki/scss/visual.scss'
'wiki/scss/splitter.scss',
'wiki/scss/visual.scss'
@@
-186,8
+198,9
@@
PIPELINE = {
# base UI
'js/wiki/base.js',
# base UI
'js/wiki/base.js',
- 'wiki/js/sidebar-perspective.js',
'js/wiki/toolbar.js',
'js/wiki/toolbar.js',
+ 'js/lib/diff.js',
+ 'js/wiki/undo.js',
# dialogs
'js/wiki/dialog_save.js',
# dialogs
'js/wiki/dialog_save.js',
@@
-195,6
+208,7
@@
PIPELINE = {
'js/wiki/dialog_pubmark.js',
# views
'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',
'js/wiki/view_history.js',
'js/wiki/view_summary.js',
'js/wiki/view_editor_source.js',
@@
-266,6
+280,9
@@
PIPELINE = {
}
}
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
+
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
@@
-281,6
+298,16
@@
REST_FRAMEWORK = {
}
}
+LANGUAGES = [
+ ('pl', 'polski'),
+ ('de', 'Deutsch'),
+ ('lt', 'lietuvių'),
+]
+
+
+TEST_INTEGRATION = False
+
+
try:
SENTRY_DSN
except NameError:
try:
SENTRY_DSN
except NameError: