add migdal blog

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 20c7c97..2913380 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -66,4 +66,9 @@ mailchimp3
 
 requests
 
 
 requests
 

-paypalrestsdk
\ No newline at end of file
+paypalrestsdk
+
+django-haystack<2.8.0
+django-migdal>=0.7.6
+
+python-slugify
\ No newline at end of file

diff --git a/src/wolnelektury/settings/__init__.py b/src/wolnelektury/settings/__init__.py
index 54dca9c..b57ca55 100644 (file)
--- a/src/wolnelektury/settings/__init__.py
+++ b/src/wolnelektury/settings/__init__.py
@@ -93,6 +93,10 @@ INSTALLED_APPS_CONTRIB = [
     'django_extensions',
     'raven.contrib.django.raven_compat',
 
     'django_extensions',
     'raven.contrib.django.raven_compat',
 

+    'migdal',
+    'django_comments',
+    'django_comments_xtd',
+

     # allauth stuff
     'uni_form',
     'allauth',
     # allauth stuff
     'uni_form',
     'allauth',

diff --git a/src/wolnelektury/settings/contrib.py b/src/wolnelektury/settings/contrib.py
index e7047c0..70eca9e 100644 (file)
--- a/src/wolnelektury/settings/contrib.py
+++ b/src/wolnelektury/settings/contrib.py
@@ -2,6 +2,8 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+from fnpdjango.utils.text.textilepl import textile_pl
+

 HONEYPOT_FIELD_NAME = 'miut'
 PAGINATION_INVALID_PAGE_RAISES_404 = True
 THUMBNAIL_QUALITY = 95
 HONEYPOT_FIELD_NAME = 'miut'
 PAGINATION_INVALID_PAGE_RAISES_404 = True
 THUMBNAIL_QUALITY = 95


@@ -25,3 +27,7 @@ PAYPAL_CONFIG = {
     'client_id': '',
     'client_secret': '',
 }
     'client_id': '',
     'client_secret': '',
 }

+
+MARKUP_FIELD_TYPES = (
+    ('textile_pl', textile_pl),
+)

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 8be119e..3c1997d 100644 (file)
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -186,7 +186,7 @@ PIPELINE = {
     )
 }
 
     )
 }
 

-STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage'
+STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineCachedStorage'

 
 # PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
 # PIPELINE_PYSCSS_ARGUMENTS = ''
 
 # PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
 # PIPELINE_PYSCSS_ARGUMENTS = ''