X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f99929a3fa250a4d39388013b990334ae1f7c779..75957f735219259d3b4bc361f80ccd3d7b92a0e9:/src/wolnelektury/settings/apps.py diff --git a/src/wolnelektury/settings/apps.py b/src/wolnelektury/settings/apps.py index 7e293d3bd..ba313f5c3 100644 --- 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 @@ -32,6 +32,7 @@ INSTALLED_APPS_OUR = [ 'contact', 'isbn', 'paypal', + 'push', ] INSTALLED_APPS_CONTRIB = [ @@ -46,9 +47,10 @@ 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', @@ -56,17 +58,13 @@ INSTALLED_APPS_CONTRIB = [ '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', @@ -74,6 +72,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