Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (159 commits) [#1043] fix search accounts. tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir Expose `skip_thread_containment` in nodeinfo Split alters rather than work with indexes Use fallback values for search queries Fix migration [#1048] Fixed version parsing in pleroma_ctl. Closes #1036. [#1048] Resolved violations of SemVer version format. Refactoring. Add fallback value to the admin report view. Move changelog entries [#1033] Fix database migrations Update changelog and admin API docs with tags, display_name, avatar additions OTP Release install docs: Remove --dry-run in cron certbot command Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses) [#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text Fix not being able to pin unlisted posts Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs Add a caveat for docker deployment in the config docs Revert "Build releases only on tags or develop" Build releases only on tags or develop ...
This commit is contained in:
commit
ae4d15503b
581 changed files with 6096 additions and 1582 deletions
|
|
@ -99,6 +99,7 @@ config :pleroma, Pleroma.Uploaders.MDII,
|
|||
|
||||
config :pleroma, :emoji,
|
||||
shortcode_globs: ["/emoji/custom/**/*.png"],
|
||||
pack_extensions: [".png", ".gif"],
|
||||
groups: [
|
||||
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
|
||||
Custom: ["/emoji/*.png", "/emoji/**/*.png"]
|
||||
|
|
@ -139,6 +140,7 @@ config :pleroma, Pleroma.Web.Endpoint,
|
|||
instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
|
||||
url: [host: "localhost"],
|
||||
http: [
|
||||
ip: {127, 0, 0, 1},
|
||||
dispatch: [
|
||||
{:_,
|
||||
[
|
||||
|
|
@ -167,7 +169,7 @@ config :logger, :console,
|
|||
|
||||
config :logger, :ex_syslogger,
|
||||
level: :debug,
|
||||
ident: "Pleroma",
|
||||
ident: "pleroma",
|
||||
format: "$metadata[$level] $message",
|
||||
metadata: [:request_id]
|
||||
|
||||
|
|
@ -342,7 +344,10 @@ config :pleroma, :mrf_keyword,
|
|||
|
||||
config :pleroma, :mrf_subchain, match_actor: %{}
|
||||
|
||||
config :pleroma, :rich_media, enabled: true
|
||||
config :pleroma, :rich_media,
|
||||
enabled: true,
|
||||
ignore_hosts: [],
|
||||
ignore_tld: ["local", "localdomain", "lan"]
|
||||
|
||||
config :pleroma, :media_proxy,
|
||||
enabled: false,
|
||||
|
|
@ -455,6 +460,8 @@ config :auto_linker,
|
|||
opts: [
|
||||
scheme: true,
|
||||
extra: true,
|
||||
# TODO: Set to :no_scheme when it works properly
|
||||
validate_tld: true,
|
||||
class: false,
|
||||
strip_prefix: false,
|
||||
new_window: false,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue