Merge remote-tracking branch 'upstream/2022.09-rc' into duplicates
This commit is contained in:
commit
36668dfdb1
15 changed files with 276 additions and 580 deletions
|
|
@ -697,6 +697,7 @@ return [
|
|||
"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
|
||||
"alias" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""],
|
||||
"pubkey" => ["type" => "text", "comment" => ""],
|
||||
"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
|
||||
"updated" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
|
||||
"interacting_count" => ["type" => "int unsigned", "default" => 0, "comment" => "Number of contacts this contact interactes with"],
|
||||
"interacted_count" => ["type" => "int unsigned", "default" => 0, "comment" => "Number of contacts that interacted with this contact"],
|
||||
|
|
|
|||
|
|
@ -525,6 +525,14 @@ return [
|
|||
// The authentication password for the redis database
|
||||
'redis_password' => null,
|
||||
|
||||
// relay_deny_languages (Array)
|
||||
// Array of languages (two digit format) that are rejected.
|
||||
'relay_deny_languages' => [],
|
||||
|
||||
// relay_deny_undetected_language (Boolean)
|
||||
// Deny undetected languages
|
||||
'relay_deny_undetected_language' => false,
|
||||
|
||||
// session_handler (database|cache|native)
|
||||
// Whether to use Cache to store session data or to use PHP native session storage.
|
||||
'session_handler' => 'database',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue