Merge branch 'master' into dist/eole/2.7.2/master
This commit is contained in:
commit
bfd5eef5c2
|
@ -236,13 +236,17 @@ AVATAR_UPLOAD_PATH = data/avatars
|
||||||
GRAVATAR_SOURCE = gravatar
|
GRAVATAR_SOURCE = gravatar
|
||||||
DISABLE_GRAVATAR = false
|
DISABLE_GRAVATAR = false
|
||||||
|
|
||||||
|
[repository.upload]
|
||||||
|
ALLOWED_TYPES = application/zip|application/gzip|application/x-gzip|application/x-gtar|application/x-tgz|application/x-compressed-tar|text/plain
|
||||||
|
|
||||||
[attachment]
|
[attachment]
|
||||||
; Whether attachments are enabled. Defaults to `true`
|
; Whether attachments are enabled. Defaults to `true`
|
||||||
ENABLE = true
|
ENABLE = true
|
||||||
; Path for attachments. Defaults to `data/attachments`
|
; Path for attachments. Defaults to `data/attachments`
|
||||||
PATH = data/attachments
|
PATH = data/attachments
|
||||||
; One or more allowed types, e.g. image/jpeg|image/png
|
; One or more allowed types, e.g. image/jpeg|image/png
|
||||||
ALLOWED_TYPES = image/jpeg|image/png
|
; ALLOWED_TYPES = image/jpeg|image/png
|
||||||
|
ALLOWED_TYPES = */*
|
||||||
; Max size of each file. Defaults to 32MB
|
; Max size of each file. Defaults to 32MB
|
||||||
MAX_SIZE = 32
|
MAX_SIZE = 32
|
||||||
; Max number of files per upload. Defaults to 10
|
; Max number of files per upload. Defaults to 10
|
||||||
|
|
Loading…
Reference in New Issue