X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/10dc1a5e84d23582a58ead2551ddf54a66b94496..de25649c03f4d7d476bf8764ba8671681bfd6324:/src/wolnelektury/settings/apps.py?ds=sidebyside

diff --git a/src/wolnelektury/settings/apps.py b/src/wolnelektury/settings/apps.py
index 07f7ff1fc..fa2f82f31 100644
--- a/src/wolnelektury/settings/apps.py
+++ b/src/wolnelektury/settings/apps.py
@@ -1,8 +1,7 @@
-# -*- 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.
 #
-# These are the ones we should test.
+
 INSTALLED_APPS_OUR = [
     'wolnelektury',
     # our
@@ -33,6 +32,7 @@ INSTALLED_APPS_OUR = [
     'isbn',
     'paypal',
     'push',
+    'club.apps.ClubConfig',
 ]
 
 INSTALLED_APPS_CONTRIB = [
@@ -42,29 +42,26 @@ INSTALLED_APPS_CONTRIB = [
     # 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',
+    'admin_ordering',
     'rest_framework',
     'fnp_django_pagination',
     'pipeline',
     'piwik',
     'sorl.thumbnail',
-    'kombu.transport.django',
     'honeypot',
     'fnpdjango',
     'getpaid',
     'getpaid.backends.payu',
-    'ssify',
     'django_extensions',
-    'raven.contrib.django.raven_compat',
+    'forms_builder.forms',
 
-    'migdal',
-    'django_comments',
-    'django_comments_xtd',
-    'django_gravatar',
+    'debug_toolbar',
 
     # allauth stuff
     'allauth',
@@ -74,6 +71,24 @@ INSTALLED_APPS_CONTRIB = [
     '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