diff options
| author | lain <lain@soykaf.club> | 2020-05-21 14:30:34 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-21 14:30:34 +0000 |
| commit | ab1154e13fece4ca552deaf5c62030c826c09760 (patch) | |
| tree | 88c27719adecc959d7741b44fe06117c456e1abb /config/description.exs | |
| parent | a42a0716ec769dfbd97505b6c872c5ea1a8f800a (diff) | |
| parent | b7fc61e17b995e3aa4e52f85b91d320a1cd1e106 (diff) | |
| download | pleroma-ab1154e13fece4ca552deaf5c62030c826c09760.tar.gz pleroma-ab1154e13fece4ca552deaf5c62030c826c09760.zip | |
Merge branch 'admin-logo-upload' into 'develop'
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/config/description.exs b/config/description.exs index 716bcf4ff..cf7cc297a 100644 --- a/config/description.exs +++ b/config/description.exs @@ -969,6 +969,13 @@ config :pleroma, :config_description, [ ] } ] + }, + %{ + key: :instance_thumbnail, + type: :string, + description: + "The instance thumbnail image. It will appear in [Pleroma Instances](http://distsn.org/pleroma-instances.html)", + suggestions: ["/instance/thumbnail.jpeg"] } ] }, @@ -1112,7 +1119,7 @@ config :pleroma, :config_description, [ logoMask: true, minimalScopesMode: false, noAttachmentLinks: false, - nsfwCensorImage: "", + nsfwCensorImage: "/static/img/nsfw.74818f9.png", postContentType: "text/plain", redirectRootLogin: "/main/friends", redirectRootNoLogin: "/main/all", @@ -1226,7 +1233,7 @@ config :pleroma, :config_description, [ type: :string, description: "URL of the image to use for hiding NSFW media attachments in the timeline.", - suggestions: ["/static/img/nsfw.png"] + suggestions: ["/static/img/nsfw.74818f9.png"] }, %{ key: :postContentType, @@ -1346,6 +1353,12 @@ config :pleroma, :config_description, [ suggestions: [ :pleroma_fox_tan ] + }, + %{ + key: :default_user_avatar, + type: :string, + description: "URL of the default user avatar.", + suggestions: ["/images/avi.png"] } ] }, |