Remove legacy search.

[wolnelektury.git] / src / wolnelektury / settings / apps.py

diff --git a/src/wolnelektury/settings/apps.py b/src/wolnelektury/settings/apps.py
index 320f6dd..cac86d8 100644 (file)
--- a/src/wolnelektury/settings/apps.py
+++ b/src/wolnelektury/settings/apps.py
@@ -6,15 +6,21 @@ INSTALLED_APPS_OUR = [
     'wolnelektury',
     # our
     'ajaxable',
     'wolnelektury',
     # our
     'ajaxable',

+    'annoy',

     'api',
     'catalogue',
     'chunks',
     'dictionary',
     'api',
     'catalogue',
     'chunks',
     'dictionary',

+    'education',
+    'experiments',

     'infopages',
     'lesmianator',
     'infopages',
     'lesmianator',

+    'messaging',

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

+    'pz',
+    'references',

     'reporting',
     'sponsors',
     'stats',
     'reporting',
     'sponsors',
     'stats',


@@ -32,6 +38,8 @@ INSTALLED_APPS_OUR = [
     'isbn',
     'paypal',
     'push',
     'isbn',
     'paypal',
     'push',

+    'club',
+    'redirects',

 ]
 
 INSTALLED_APPS_CONTRIB = [
 ]
 
 INSTALLED_APPS_CONTRIB = [


@@ -41,23 +49,23 @@ INSTALLED_APPS_CONTRIB = [
     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',
     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',

+    'django.contrib.messages',

     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.staticfiles',
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.staticfiles',

+    'django.contrib.postgres',

     'admin_ordering',
     'rest_framework',
     'fnp_django_pagination',
     'pipeline',
     'admin_ordering',
     'rest_framework',
     'fnp_django_pagination',
     'pipeline',

-    'piwik',

     'sorl.thumbnail',
     'honeypot',
     'fnpdjango',
     'sorl.thumbnail',
     'honeypot',
     'fnpdjango',

-    'getpaid',
-    'getpaid.backends.payu',

     'django_extensions',
     'django_extensions',

-    'club.apps.ClubConfig',
+    'forms_builder.forms',
+    'django_countries',

 
     'debug_toolbar',
 
 
     'debug_toolbar',
 


@@ -69,24 +77,6 @@ INSTALLED_APPS_CONTRIB = [
     'allauth.socialaccount.providers.facebook',
     'allauth.socialaccount.providers.google',
     # 'allauth.socialaccount.providers.twitter',
     'allauth.socialaccount.providers.facebook',
     'allauth.socialaccount.providers.google',
     # 'allauth.socialaccount.providers.twitter',

-
-    # Machina dependencies:
-    'mptt',
-    'haystack',
-    'widget_tweaks',
-
-    # Machina apps:
-    'machina',
-    'machina.apps.forum',
-    'machina.apps.forum_conversation',
-    'machina.apps.forum_conversation.forum_attachments',
-    'machina.apps.forum_conversation.forum_polls',
-    'machina.apps.forum_feeds',
-    'machina.apps.forum_moderation',
-    'machina.apps.forum_search',
-    'machina.apps.forum_tracking',
-    'machina.apps.forum_member',
-    'machina.apps.forum_permission',

 ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB
 ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB