Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (294 commits) Fix incorrect fallback when English is set to first language Fix eratic test for POST /api/pleroma/admin/reports/:id/notes After code review Support fallbacking to other languages Delete report notifs when demoting from superuser Update Caddyfile to Caddy v2 Lint Support multiple locales from userLanguage cookie Support multiple locales formally Make lint happy Add test for fallbacking to a general language Fallback to a variant if the language in general is not supported Add changelog Document API addition Allow user to register with custom language Allow update_credentials to update User.language Send emails i18n'd using backend-stored user language Make all emails translatable Fix digest test Make mail and mailer translatable ...
This commit is contained in:
commit
31115e24c0
5121 changed files with 13043 additions and 13896 deletions
|
|
@ -139,6 +139,7 @@ config :pleroma, Pleroma.Web.Endpoint,
|
|||
],
|
||||
protocol: "https",
|
||||
secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
|
||||
live_view: [signing_salt: "U5ELgdEwTD3n1+D5s0rY0AMg8/y1STxZ3Zvsl3bWh+oBcGrYdil0rXqPMRd3Glcq"],
|
||||
signing_salt: "CqaoopA2",
|
||||
render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
|
||||
pubsub_server: Pleroma.PubSub,
|
||||
|
|
@ -251,7 +252,13 @@ config :pleroma, :instance,
|
|||
]
|
||||
],
|
||||
show_reactions: true,
|
||||
password_reset_token_validity: 60 * 60 * 24
|
||||
password_reset_token_validity: 60 * 60 * 24,
|
||||
profile_directory: true,
|
||||
privileged_staff: false,
|
||||
max_endorsed_users: 20,
|
||||
birthday_required: false,
|
||||
birthday_min_age: 0,
|
||||
max_media_attachments: 1_000
|
||||
|
||||
config :pleroma, :welcome,
|
||||
direct_message: [
|
||||
|
|
@ -319,9 +326,6 @@ config :pleroma, :frontend_configurations,
|
|||
subjectLineBehavior: "noop",
|
||||
theme: "sigsegv2",
|
||||
webPushNotifications: false
|
||||
},
|
||||
masto_fe: %{
|
||||
showInstanceSpecificPanel: true
|
||||
}
|
||||
|
||||
config :pleroma, :assets,
|
||||
|
|
@ -350,6 +354,7 @@ config :pleroma, :manifest,
|
|||
config :pleroma, :activitypub,
|
||||
unfollow_blocked: true,
|
||||
outgoing_blocks: true,
|
||||
blockers_visible: true,
|
||||
follow_handshake_timeout: 500,
|
||||
note_replies_output_limit: 5,
|
||||
sign_object_fetches: true,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue