Merge master into img-playground. Image support with new management features. Missing...

[redakcja.git] / redakcja / settings / common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 5a337fb..cc7765e 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -120,12 +120,17 @@ INSTALLED_APPS = (
     'catalogue',
     'dvcs',
     'wiki',
+    'wiki_img',
     'toolbar',
     'apiclient',
+    'email_mangler',
 )
 
 LOGIN_REDIRECT_URL = '/documents/user'
 
+CAS_USER_ATTRS_MAP = {
+    'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'}
+
 
 FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
 FILEBROWSER_DIRECTORY = 'images/'