From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Mon, 27 Aug 2012 12:20:35 +0000 (+0200)
Subject: Merge branch 'master' into search
X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/b1fb752ca1abb051a63da4729e34a80affc25c76?ds=inline;hp=-c

Merge branch 'master' into search

Conflicts:
	prawokultury/settings.d/30-apps.conf
	requirements.txt
---

b1fb752ca1abb051a63da4729e34a80affc25c76
diff --combined prawokultury/settings.d/30-apps.conf
index 3824631,fdd916d..c950a4e
--- a/prawokultury/settings.d/30-apps.conf
+++ b/prawokultury/settings.d/30-apps.conf
@@@ -8,7 -8,8 +8,9 @@@ INSTALLED_APPS = 
      'django.contrib.comments',
      'django_comments_xtd',
      'pipeline',
 +    'haystack',
+     'pagination',
+     'sorl.thumbnail',
  
      'django.contrib.auth',
      'django.contrib.contenttypes',
diff --combined prawokultury/urls.py
index 6da0510,0d9da8c..436cb0e
--- a/prawokultury/urls.py
+++ b/prawokultury/urls.py
@@@ -19,11 -19,16 +19,17 @@@ urlpatterns = patterns(''
      url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
              'document_root': settings.MEDIA_ROOT,
          }),
 +    url(r'^search/', include('haystack.urls')),
  ) + i18n_patterns('',
      url(string_concat(r'^', _('events'), r'/'), include('events.urls')),
      url(r'^comments/', include('django_comments_xtd.urls')),
  ) + migdal_urlpatterns
  
+ if settings.DEBUG:
+     urlpatterns += patterns('',
+         url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+             'document_root': settings.MEDIA_ROOT,
+         }),
+    )
  
 -urlpatterns += staticfiles_urlpatterns()
 +urlpatterns += staticfiles_urlpatterns()
diff --combined requirements.txt
index 7efd852,c290b2b..145192a
--- a/requirements.txt
+++ b/requirements.txt
@@@ -2,12 -2,13 +2,17 @@@ Django>=1.4,<1.
  South>=0.7.4
  PIL
  sorl-thumbnail>=11.09,<12
+ django-pagination
  
  textile
  django-markupfield
  django-gravatar
  django_comments_xtd
- django-pipeline
+ django-pipeline>=1.2,<1.3
++
+ #pyScss
+ #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
+ #TODO: pyScss support, for now just install sass
 +
 +-e git+https://github.com/toastdriven/django-haystack.git@master#egg=django-haystack
 +pysolr