haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 21:07:17 +00:00
Code Issues Releases Wiki Activity

Merge branch '5.1'

Browse Source 
Conflicts:
	seahub/templates/registration/password_change_form.html
	seahub/templates/sysadmin/base.html
	seahub/templates/sysadmin/sysadmin_backbone.html
This commit is contained in:
Daniel Pan
2016-06-13 18:25:20 +08:00
parent dd89b0d6d5 1e66dca52e
commit b567379c2c
57 changed files with 1376 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seahub/settings.py
View File

@@ -212,6 +212,8 @@ INSTALLED_APPS = (
'seahub.password_session',
)
# Enabled or disable constance(web settings).
ENABLE_SETTINGS_VIA_WEB = True
CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend'
CONSTANCE_DATABASE_CACHE_BACKEND = 'default'
@@ -601,8 +603,10 @@ if 'win32' in sys.platform:
fp.write("%d\n" % os.getpid())
fp.close()
# Following settings are private, can not be overwrite.
INNER_FILE_SERVER_ROOT = 'http://127.0.0.1:' + FILE_SERVER_PORT
CONSTANCE_ENABLED = ENABLE_SETTINGS_VIA_WEB
CONSTANCE_CONFIG = {
'SERVICE_URL': (SERVICE_URL,''),
'FILE_SERVER_ROOT': (FILE_SERVER_ROOT,''),