phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/collections

Browse Source
This commit is contained in:
Anatoly 2019-08-23 13:34:04 +03:00
commit 6c044469d6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
project/settings/base.py
View File

@ -185,8 +185,6 @@ STATICFILES_DIRS = (
os.path.join(PROJECT_ROOT, 'static'), os.path.join(PROJECT_ROOT, 'static'),
) )
FILE_UPLOAD_PERMISSIONS = 0o644
AVAILABLE_VERSIONS = { AVAILABLE_VERSIONS = {
# 'future': '1.0.1', # 'future': '1.0.1',
'current': '1.0.0', 'current': '1.0.0',
@ -367,3 +365,12 @@ CONFIRM_EMAIL_TEMPLATE = 'account/confirm_email.html'
# COOKIES # COOKIES
COOKIES_MAX_AGE = 86400 # 24 hours COOKIES_MAX_AGE = 86400 # 24 hours
# UPLOAD FILES
# Increase upload maximum file size
# Maximum POST data size
DATA_UPLOAD_MAX_MEMORY_SIZE = 5242880 # 5MB
# Maximum uploaded file size
FILE_UPLOAD_MAX_MEMORY_SIZE = 5242880 # 5MB
FILE_UPLOAD_PERMISSIONS = 0o644