Merge remote-tracking branch 'origin/filmowa' into filmowa

[edumed.git] / edumed / settings.d / 30-apps.py

diff --git a/edumed/settings.d/30-apps.py b/edumed/settings.d/30-apps.py
index 824b44b..9416e33 100644 (file)
--- a/edumed/settings.d/30-apps.py
+++ b/edumed/settings.d/30-apps.py
@@ -2,12 +2,16 @@ INSTALLED_APPS = (
     'edumed',
     'curriculum',
     'catalogue',
     'edumed',
     'curriculum',
     'catalogue',

+    'comment',
+    'wtem',
+    'publishers',

 
     'fnpdjango',
     'south',
     'pipeline',
 
     'fnpdjango',
     'south',
     'pipeline',

+    'django_extensions',

     # Disable, if not using Piwik.
     # Disable, if not using Piwik.

-    'piwik.django',
+    'piwik',

     # Disable, if not using CAS.
     'honeypot',
     'django_cas',
     # Disable, if not using CAS.
     'honeypot',
     'django_cas',


@@ -15,9 +19,11 @@ INSTALLED_APPS = (
     'haystack',
     'chunks',
     'contact',
     'haystack',
     'chunks',
     'contact',

+    'forum',

     'pybb',
     'django_libravatar',
     'sorl.thumbnail',
     'pybb',
     'django_libravatar',
     'sorl.thumbnail',

+    'subdomains',

 
     'django.contrib.auth',
     'django.contrib.contenttypes',
 
     'django.contrib.auth',
     'django.contrib.contenttypes',


@@ -28,4 +34,5 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.flatpages',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.flatpages',

+    'django.contrib.humanize'

 )
 )