Merge remote-tracking branch 'origin/develop' into shigusegubu

* origin/develop:
  Fix bookmarks depending on embeded object and move checking if the status is bookmarked to SQL
  update pleroma frontend
  tests: fix up for changed bbcode library output and verify html is properly escaped
  add support for bbcode
  mix: add bbcode dependency
  update Changelog
  Add mediaproxy whitelist capability
  Move settings to Source subentity
  test fixes
  fixes for tests
  migration without using old field name
  unused
  removing useless transaction
  migration optimization
  changelog file update
  favourites add bookmark display
  migrate user.bookmarks to separate table
  bookmarks in separate table
  activitypub: transmogrifier: send reject follow if following does not succeed
  Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This commit is contained in:
Henry Jameson 2019-04-28 18:29:15 +03:00
commit 10d743e46a
62 changed files with 763 additions and 295 deletions

View file

@ -224,6 +224,7 @@ config :pleroma, :instance,
static_dir: "instance/static/",
allowed_post_formats: [
"text/plain"
"text/bbcode"
],
mrf_transparency: true,
autofollowed_nicknames: [],
@ -319,7 +320,8 @@ config :pleroma, :media_proxy,
follow_redirect: true,
pool: :media
]
]
],
whitelist: []
config :pleroma, :chat, enabled: false