Add pz field

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

diff --git a/src/wolnelektury/settings/apps.py b/src/wolnelektury/settings/apps.py
index ac6c08e..769565d 100644 (file)
--- 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 = [
 #
 
 INSTALLED_APPS_OUR = [


@@ -11,6 +11,7 @@ INSTALLED_APPS_OUR = [
     'catalogue',
     'chunks',
     'dictionary',
     'catalogue',
     'chunks',
     'dictionary',

+    'education',

     'experiments',
     'infopages',
     'lesmianator',
     'experiments',
     'infopages',
     'lesmianator',


@@ -37,8 +38,8 @@ INSTALLED_APPS_OUR = [
     'isbn',
     'paypal',
     'push',
     'isbn',
     'paypal',
     'push',

-    'club.apps.ClubConfig',
-    'redirects.apps.RedirectsConfig',
+    'club',
+    'redirects',

 ]
 
 INSTALLED_APPS_CONTRIB = [
 ]
 
 INSTALLED_APPS_CONTRIB = [


@@ -54,6 +55,7 @@ INSTALLED_APPS_CONTRIB = [
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.staticfiles',

+    'django.contrib.postgres',

     'admin_ordering',
     'rest_framework',
     'fnp_django_pagination',
     'admin_ordering',
     'rest_framework',
     'fnp_django_pagination',


@@ -61,8 +63,6 @@ INSTALLED_APPS_CONTRIB = [
     'sorl.thumbnail',
     'honeypot',
     'fnpdjango',
     'sorl.thumbnail',
     'honeypot',
     'fnpdjango',

-    'getpaid',
-    'getpaid.backends.payu',

     'django_extensions',
     'forms_builder.forms',
     'django_countries',
     'django_extensions',
     'forms_builder.forms',
     'django_countries',


@@ -77,24 +77,6 @@ INSTALLED_APPS_CONTRIB = [
     'allauth.socialaccount.providers.facebook',
     'allauth.socialaccount.providers.google',
     # 'allauth.socialaccount.providers.twitter',
     '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
 ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB