fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: d316a52 a4be8e3)
Merge branch 'lucene_memory'
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 11 Apr 2012 09:24:59 +0000 (11:24 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 11 Apr 2012 09:24:59 +0000 (11:24 +0200)
1  2 
wolnelektury/settings/__init__.py patch | diff1 | diff2 | blob | history

diff --combined wolnelektury/settings/__init__.py
index f2314a9,ed7bda0..15126b9
--- 1/wolnelektury/settings/__init__.py
--- 2/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@@ -53,6 -53,7 +53,6 @@@ INSTALLED_APPS_OUR = 
      'dictionary',
      'infopages',
      'lesmianator',
 -    #'lessons',
      'newtagging',
      'opds',
      'pdcounter',
@@@ -63,6 -64,7 +63,7 @@@
      'picture',
      'social',
      'waiter',
+     'search',
      ]
  
  INSTALLED_APPS_CONTRIB = [
@@@ -73,9 -75,7 +74,9 @@@
      'django.contrib.sites',
      'django.contrib.admin',
      'django.contrib.admindocs',
 +    'django.contrib.staticfiles',
      'pagination',
 +    'pipeline',
      'piston',
      'piwik.django',
      #'rosetta',
@@@ -97,6 -97,7 +98,6 @@@
      #'allauth.twitter',
  
      # included
 -    'compress',
      'modeltranslation',
      ]