Merge branch '1.0.x' into testing
This commit is contained in:
commit
7db5abff69
5
README
5
README
|
@ -871,9 +871,8 @@ shorturllength: ignored. See 'url' section below.
|
|||
dupelimit: minimum time allowed for one person to say the same thing
|
||||
twice. Default 60s. Anything lower is considered a user
|
||||
or UI error.
|
||||
textlimit: default max size for texts in the site. Defaults to 140.
|
||||
0 means no limit. Can be fine-tuned for notices, messages,
|
||||
profile bios and group descriptions.
|
||||
textlimit: default max size for texts in the site. Defaults to 0 (no limit).
|
||||
Can be fine-tuned for notices, messages, profile bios and group descriptions.
|
||||
|
||||
db
|
||||
--
|
||||
|
|
|
@ -58,7 +58,7 @@ $default =
|
|||
'sslserver' => null,
|
||||
'shorturllength' => 30,
|
||||
'dupelimit' => 60, // default for same person saying the same thing
|
||||
'textlimit' => 140,
|
||||
'textlimit' => 0, // in chars; 0 == no limit
|
||||
'indent' => true,
|
||||
'use_x_sendfile' => false,
|
||||
'notice' => null, // site wide notice text
|
||||
|
|
Loading…
Reference in New Issue
Block a user