From: Marcin Koziej Date: Wed, 11 Apr 2012 09:24:59 +0000 (+0200) Subject: Merge branch 'lucene_memory' X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/6e32f55e3ef50d9f7d3a291c2388c5220851a9b4?ds=sidebyside;hp=-c Merge branch 'lucene_memory' --- 6e32f55e3ef50d9f7d3a291c2388c5220851a9b4 diff --combined wolnelektury/settings/__init__.py index f2314a9ad,ed7bda0f4..15126b9a4 --- a/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', ]