Merge remote-tracking branch 'zawadzki/new-design'

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

diff --git a/src/wolnelektury/settings/apps.py b/src/wolnelektury/settings/apps.py
index 241b4b7..ac01166 100644 (file)
--- a/src/wolnelektury/settings/apps.py
+++ b/src/wolnelektury/settings/apps.py
@@ -1,21 +1,25 @@
 # 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 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',
     # our
     'ajaxable',
 
 INSTALLED_APPS_OUR = [
     'wolnelektury',
     # our
     'ajaxable',

+    'annoy',

     'api',
     'catalogue',
     'chunks',
     'dictionary',
     'api',
     'catalogue',
     'chunks',
     'dictionary',

+    'experiments',

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

+    'messaging',

     'newtagging',
     'opds',
     'pdcounter',
     'newtagging',
     'opds',
     'pdcounter',

+    'pz',
+    'references',

     'reporting',
     'sponsors',
     'stats',
     'reporting',
     'sponsors',
     'stats',


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

+    'club',
+    'redirects',

 ]
 
 INSTALLED_APPS_CONTRIB = [
 ]
 
 INSTALLED_APPS_CONTRIB = [


@@ -42,6 +48,7 @@ INSTALLED_APPS_CONTRIB = [
     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',
     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',

+    'django.contrib.messages',

     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',


@@ -51,14 +58,14 @@ INSTALLED_APPS_CONTRIB = [
     'rest_framework',
     'fnp_django_pagination',
     'pipeline',
     'rest_framework',
     'fnp_django_pagination',
     'pipeline',

-    'piwik',

     'sorl.thumbnail',
     'honeypot',
     'fnpdjango',
     'getpaid',
     'getpaid.backends.payu',
     'django_extensions',
     'sorl.thumbnail',
     'honeypot',
     'fnpdjango',
     'getpaid',
     'getpaid.backends.payu',
     'django_extensions',

-    'club.apps.ClubConfig',
+    'forms_builder.forms',
+    'django_countries',

 
     'debug_toolbar',
 
 
     'debug_toolbar',
 


@@ -71,10 +78,23 @@ INSTALLED_APPS_CONTRIB = [
     'allauth.socialaccount.providers.google',
     # 'allauth.socialaccount.providers.twitter',
 
     'allauth.socialaccount.providers.google',
     # 'allauth.socialaccount.providers.twitter',
 

-    # Machina related apps:
+    # Machina dependencies:

     'mptt',
     'haystack',
     'widget_tweaks',
     '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
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB