Merge branch 'master' into production

[wolnelektury.git] / wolnelektury / settings / __init__.py

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index 679abec..15126b9 100644 (file)
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -53,7 +53,6 @@ INSTALLED_APPS_OUR = [
     'dictionary',
     'infopages',
     'lesmianator',
     'dictionary',
     'infopages',
     'lesmianator',

-    #'lessons',

     'newtagging',
     'opds',
     'pdcounter',
     'newtagging',
     'opds',
     'pdcounter',


@@ -62,9 +61,9 @@ INSTALLED_APPS_OUR = [
     'stats',
     'suggest',
     'picture',
     'stats',
     'suggest',
     'picture',

-    'search',

     'social',
     'waiter',
     'social',
     'waiter',

+    'search',

     ]
 
 INSTALLED_APPS_CONTRIB = [
     ]
 
 INSTALLED_APPS_CONTRIB = [


@@ -75,7 +74,9 @@ INSTALLED_APPS_CONTRIB = [
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',

+    'django.contrib.staticfiles',

     'pagination',
     'pagination',

+    'pipeline',

     'piston',
     'piwik.django',
     #'rosetta',
     'piston',
     'piwik.django',
     #'rosetta',


@@ -97,7 +98,6 @@ INSTALLED_APPS_CONTRIB = [
     #'allauth.twitter',
 
     # included
     #'allauth.twitter',
 
     # included

-    'compress',

     'modeltranslation',
     ]
 
     'modeltranslation',
     ]