X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/eaf0711613bea8181528d8911b30ef7976b7bb42..2ecf0995e67a4fefb003e66a2490d4895b2c0b07:/src/wolnelektury/settings/apps.py diff --git a/src/wolnelektury/settings/apps.py b/src/wolnelektury/settings/apps.py index 76ffa6f45..320f6ddd4 100644 --- a/src/wolnelektury/settings/apps.py +++ b/src/wolnelektury/settings/apps.py @@ -1,7 +1,6 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. - -from machina import get_apps as get_machina_apps +# INSTALLED_APPS_OUR = [ 'wolnelektury', @@ -58,7 +57,6 @@ INSTALLED_APPS_CONTRIB = [ 'getpaid', 'getpaid.backends.payu', 'django_extensions', - 'raven.contrib.django.raven_compat', 'club.apps.ClubConfig', 'debug_toolbar', @@ -72,10 +70,23 @@ INSTALLED_APPS_CONTRIB = [ 'allauth.socialaccount.providers.google', # 'allauth.socialaccount.providers.twitter', - # Machina related apps: + # Machina dependencies: 'mptt', 'haystack', 'widget_tweaks', -] + get_machina_apps() + + # 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