projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into frontend-switcher-9000
[akkoma]
/
config
/
description.exs
diff --git
a/config/description.exs
b/config/description.exs
index f8496760fccd0f6d4e0b405499fcfb1e0d4fd60e..d329f8afa156e3548a34c85b2e205ac58f215603 100644
(file)
--- a/
config/description.exs
+++ b/
config/description.exs
@@
-2999,6
+2999,11
@@
config :pleroma, :config_description, [
key: :federated,
type: :boolean,
description: "Disallow viewing the whole known network timeline."
key: :federated,
type: :boolean,
description: "Disallow viewing the whole known network timeline."
+ },
+ %{
+ key: :bubble,
+ type: :boolean,
+ description: "Disallow viewing the bubble timeline."
}
]
},
}
]
},
@@
-3154,6
+3159,12
@@
config :pleroma, :config_description, [
description:
"A map containing available frontends and parameters for their installation.",
children: frontend_options
description:
"A map containing available frontends and parameters for their installation.",
children: frontend_options
+ },
+ %{
+ key: :pickable,
+ type: {:list, :string},
+ description:
+ "A list containing all frontends users can pick as their preference, format is :name/:ref, e.g pleroma-fe/stable."
}
]
},
}
]
},