diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-06 13:19:26 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-06 13:19:26 +0000 |
| commit | 4cbaab2181e7dd5e471b78481997fa4ad049e192 (patch) | |
| tree | 0aa6924e890f57bbad977516a3d17aadcc8f04a2 | |
| parent | 96901b6554b4932db018986e8745bc827fa0500b (diff) | |
| parent | a283a1fcd026f33ecdd246fef6d035f95b2071a1 (diff) | |
| download | pleroma-4cbaab2181e7dd5e471b78481997fa4ad049e192.tar.gz pleroma-4cbaab2181e7dd5e471b78481997fa4ad049e192.zip | |
Merge branch 'features/masto_fe-config' into 'develop'
Add default config for masto_fe
See merge request pleroma/pleroma!906
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | docs/config.md | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index a620e7451..a867dd0bc 100644 --- a/config/config.exs +++ b/config/config.exs @@ -215,6 +215,9 @@ config :pleroma, :frontend_configurations, scopeCopy: true, subjectLineBehavior: "email", alwaysShowSubjectInput: true + }, + masto_fe: %{ + showInstanceSpecificPanel: true } config :pleroma, :activitypub, diff --git a/docs/config.md b/docs/config.md index d1bf2a6f4..465bc1d2b 100644 --- a/docs/config.md +++ b/docs/config.md @@ -129,7 +129,7 @@ See: [logger’s documentation](https://hexdocs.pm/logger/Logger.html) and [ex_s ## :frontend_configurations -This can be used to configure a keyword list that keeps the configuration data for any kind of frontend. By default, settings for `pleroma_fe` are configured. +This can be used to configure a keyword list that keeps the configuration data for any kind of frontend. By default, settings for `pleroma_fe` and `masto_fe` are configured. Frontends can access these settings at `/api/pleroma/frontend_configurations` |