Remove obsolete jsonfield dependency.

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

diff --git a/src/wolnelektury/settings/apps.py b/src/wolnelektury/settings/apps.py
index 87286d5..76ffa6f 100644 (file)
--- a/src/wolnelektury/settings/apps.py
+++ b/src/wolnelektury/settings/apps.py
@@ -1,8 +1,8 @@
-# -*- 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.
+
+from machina import get_apps as get_machina_apps
+
 INSTALLED_APPS_OUR = [
     'wolnelektury',
     # our
@@ -47,27 +47,23 @@ INSTALLED_APPS_CONTRIB = [
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.staticfiles',
+    'admin_ordering',
+    'rest_framework',
     'fnp_django_pagination',
     'pipeline',
-    'piston',
     'piwik',
     'sorl.thumbnail',
-    'kombu.transport.django',
     'honeypot',
     'fnpdjango',
     'getpaid',
     'getpaid.backends.payu',
-    'ssify',
     'django_extensions',
     'raven.contrib.django.raven_compat',
+    'club.apps.ClubConfig',
 
-    'migdal',
-    'django_comments',
-    'django_comments_xtd',
-    'django_gravatar',
+    'debug_toolbar',
 
     # allauth stuff
-    'uni_form',
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
@@ -75,6 +71,11 @@ INSTALLED_APPS_CONTRIB = [
     'allauth.socialaccount.providers.facebook',
     'allauth.socialaccount.providers.google',
     # 'allauth.socialaccount.providers.twitter',
-]
+
+    # Machina related apps:
+    'mptt',
+    'haystack',
+    'widget_tweaks',
+] + get_machina_apps()
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB