X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d66f9960d12d739c44a89d1d4e013f52783097e7..HEAD:/src/wolnelektury/settings/apps.py

diff --git a/src/wolnelektury/settings/apps.py b/src/wolnelektury/settings/apps.py
index 1d7737282..769565d03 100644
--- a/src/wolnelektury/settings/apps.py
+++ b/src/wolnelektury/settings/apps.py
@@ -1,5 +1,5 @@
-# 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 Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
 
 INSTALLED_APPS_OUR = [
@@ -11,12 +11,15 @@ INSTALLED_APPS_OUR = [
     'catalogue',
     'chunks',
     'dictionary',
+    'education',
+    'experiments',
     'infopages',
     'lesmianator',
     'messaging',
     'newtagging',
     'opds',
     'pdcounter',
+    'pz',
     'references',
     'reporting',
     'sponsors',
@@ -35,8 +38,8 @@ INSTALLED_APPS_OUR = [
     'isbn',
     'paypal',
     'push',
-    'club.apps.ClubConfig',
-    'redirects.apps.RedirectsConfig',
+    'club',
+    'redirects',
 ]
 
 INSTALLED_APPS_CONTRIB = [
@@ -52,6 +55,7 @@ INSTALLED_APPS_CONTRIB = [
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.staticfiles',
+    'django.contrib.postgres',
     'admin_ordering',
     'rest_framework',
     'fnp_django_pagination',
@@ -59,10 +63,9 @@ INSTALLED_APPS_CONTRIB = [
     'sorl.thumbnail',
     'honeypot',
     'fnpdjango',
-    'getpaid',
-    'getpaid.backends.payu',
     'django_extensions',
     'forms_builder.forms',
+    'django_countries',
 
     'debug_toolbar',
 
@@ -74,24 +77,6 @@ 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