fixes

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

diff --git a/src/wolnelektury/settings/apps.py b/src/wolnelektury/settings/apps.py
index 07f7ff1..ac01166 100644 (file)
--- a/src/wolnelektury/settings/apps.py
+++ b/src/wolnelektury/settings/apps.py
@@ -1,21 +1,25 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-# These are the ones we should test.
+

 INSTALLED_APPS_OUR = [
     'wolnelektury',
     # our
     'ajaxable',
 INSTALLED_APPS_OUR = [
     'wolnelektury',
     # our
     'ajaxable',

+    'annoy',

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

+    'experiments',

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

+    'messaging',

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

+    'pz',
+    'references',

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


@@ -33,6 +37,8 @@ INSTALLED_APPS_OUR = [
     'isbn',
     'paypal',
     'push',
     'isbn',
     'paypal',
     'push',

+    'club',
+    'redirects',

 ]
 
 INSTALLED_APPS_CONTRIB = [
 ]
 
 INSTALLED_APPS_CONTRIB = [


@@ -42,29 +48,26 @@ 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',

+    'admin_ordering',

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

-    'piwik',

     'sorl.thumbnail',
     'sorl.thumbnail',

-    'kombu.transport.django',

     'honeypot',
     'fnpdjango',
     'getpaid',
     'getpaid.backends.payu',
     'honeypot',
     'fnpdjango',
     'getpaid',
     'getpaid.backends.payu',

-    'ssify',

     'django_extensions',
     'django_extensions',

-    'raven.contrib.django.raven_compat',
+    'forms_builder.forms',
+    'django_countries',

 
 

-    'migdal',
-    'django_comments',
-    'django_comments_xtd',
-    'django_gravatar',
+    'debug_toolbar',

 
     # allauth stuff
     'allauth',
 
     # allauth stuff
     'allauth',


@@ -74,6 +77,24 @@ 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