fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'production' of github.com:fnp/redakcja into production
[redakcja.git]
/
redakcja
/
settings
/
common.py
diff --git
a/redakcja/settings/common.py
b/redakcja/settings/common.py
index
5a337fb
..
f6b889d
100644
(file)
--- a/
redakcja/settings/common.py
+++ b/
redakcja/settings/common.py
@@
-118,14
+118,19
@@
INSTALLED_APPS = (
'djkombu',
'catalogue',
'djkombu',
'catalogue',
+ 'cover',
'dvcs',
'wiki',
'toolbar',
'apiclient',
'dvcs',
'wiki',
'toolbar',
'apiclient',
+ 'email_mangler',
)
LOGIN_REDIRECT_URL = '/documents/user'
)
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/'
FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
FILEBROWSER_DIRECTORY = 'images/'