fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reversion
[redakcja.git]
/
src
/
redakcja
/
settings
/
__init__.py
diff --git
a/src/redakcja/settings/__init__.py
b/src/redakcja/settings/__init__.py
index
ecebe40
..
b204d0a
100644
(file)
--- a/
src/redakcja/settings/__init__.py
+++ b/
src/redakcja/settings/__init__.py
@@
-70,6
+70,7
@@
ROOT_URLCONF = 'redakcja.urls'
INSTALLED_APPS = (
'modeltranslation',
INSTALLED_APPS = (
'modeltranslation',
+ 'reversion',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.auth',
'django.contrib.contenttypes',
@@
-106,6
+107,9
@@
INSTALLED_APPS = (
'email_mangler',
'wlxml.apps.WlxmlConfig',
'alerts',
'email_mangler',
'wlxml.apps.WlxmlConfig',
'alerts',
+ 'team',
+ 'sources',
+ 'isbn',
)
if DEBUG:
)
if DEBUG:
@@
-124,6
+128,8
@@
LEGIMI_BIG_WORDS = 10000
LEGIMI_SMALL_PRICE = 7
LEGIMI_BIG_PRICE = 20
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',
@@
-136,21
+142,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'
@@
-195,8
+201,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',
@@
-204,6
+211,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',