Merge branch '1559-follow-request-notifications' into 'develop'
[#1559] Support for "follow_request" notifications Closes #1559 See merge request pleroma/pleroma!2354
This commit is contained in:
parent
f08c8d9932
commit
7b05933677
9 changed files with 189 additions and 49 deletions
|
|
@ -581,6 +581,8 @@ config :pleroma, :email_notifications,
|
|||
inactivity_threshold: 7
|
||||
}
|
||||
|
||||
config :pleroma, :notifications, enable_follow_request_notifications: false
|
||||
|
||||
config :pleroma, :oauth2,
|
||||
token_expires_in: 600,
|
||||
issue_new_refresh_token: true,
|
||||
|
|
|
|||
|
|
@ -2286,6 +2286,20 @@ config :pleroma, :config_description, [
|
|||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :pleroma,
|
||||
key: :notifications,
|
||||
type: :group,
|
||||
description: "Notification settings",
|
||||
children: [
|
||||
%{
|
||||
key: :enable_follow_request_notifications,
|
||||
type: :boolean,
|
||||
description:
|
||||
"Enables notifications on new follow requests (causes issues with older PleromaFE versions)."
|
||||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :pleroma,
|
||||
key: Pleroma.Emails.UserEmail,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue