Henry Jameson 10d743e46a 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		2019-04-28 18:29:15 +03:00
..
mix/tasks/pleroma	Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix	2019-04-22 11:02:31 +03:00
pleroma	Merge remote-tracking branch 'origin/develop' into shigusegubu	2019-04-28 18:29:15 +03:00
healthcheck.ex	Feature/826 healthcheck endpoint	2019-04-22 07:19:53 +00:00
jason_types.ex	Format the code.	2018-03-30 15:01:53 +02:00
transports.ex	Format the code.	2018-03-30 15:01:53 +02:00
xml_builder.ex	Format the code.	2018-03-30 15:01:53 +02:00