haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 15:19:06 +00:00
Code Issues Releases Wiki Activity

Merge branch '3.0'

Browse Source 
Conflicts:
	seahub/share/views.py
This commit is contained in:
zhengxie
2014-06-10 10:46:24 +08:00
parent fe576c11a0 f969c465ec
commit cba3ff680f
9 changed files with 90 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
seahub/settings.py
View File

@@ -216,6 +216,7 @@ OFFICE_PREVIEW_MAX_SIZE = 2 * 1024 * 1024
USE_PDFJS = True
FILE_ENCODING_LIST = ['auto', 'utf-8', 'gbk', 'ISO-8859-1', 'ISO-8859-5']
FILE_ENCODING_TRY_LIST = ['utf-8', 'gbk']
HIGHLIGHT_KEYWORD = False # If True, highlight the keywords in the file when the visit is via clicking a link in 'search result' page.
# Common settings(file extension, storage) for avatar and group avatar.
AVATAR_FILE_STORAGE = '' # Replace with 'seahub.base.database_storage.DatabaseStorage' if save avatar files to database