haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 04:10:47 +00:00
Code Issues Releases Wiki Activity

Merge branch 'xiez_profile' into lj

Browse Source 
Conflicts:
	profile/templates/profile/set_profile.html
	profile/templates/profile/user_ids.html
	profile/views.py
This commit is contained in:
llj
2012-06-22 15:51:32 +08:00
parent 9a7fa79a17 68d63efcb4
commit 329e7f4b97
12 changed files with 99 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
settings.py
View File

@@ -194,7 +194,7 @@ else:
AVATAR_STORAGE_DIR = 'avatars'
AVATAR_GRAVATAR_BACKUP = False
AVATAR_DEFAULT_URL = '/avatars/default.jpg'
AUTO_GENERATE_AVATAR_SIZES = (80, 16)
AUTO_GENERATE_AVATAR_SIZES = (80, 60, 48, 16)
AVATAR_MAX_AVATARS_PER_USER = 1
AVATAR_CACHE_TIMEOUT = 0