Henry Jameson d5e4b906c9 Merge remote-tracking branch 'origin/develop' into shigusegubu ... * origin/develop: (129 commits) Uploaders.S3: Replace unsafe characters in object key update pleroma frontend test: add smoketests for the scrubbing policies html: twittertext: add missing catchall scrub function twitter api: add no_rich_text option to userview for account prefs test: add tests for new User.html_filter_policy() mastodon api: formatting twitter api: add support for disabling rich text mastodon api: add support for user-supplied html policy twitter api: add support for user-specified html policy user: add User.html_filter_policy() html: default to using normal scrub policy if provided scrub policy is nil mix: remove fix_ap_users task, now obsolete test: add test proving that users are refreshed when stale user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task) Update mastodon frontend [Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0 [Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables [Pleroma.Web.Router]: Fake /api/v1/endorsements [Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false) ...		2018-09-25 16:18:28 +03:00
..
config.exs	Merge remote-tracking branch 'origin/develop' into shigusegubu	2018-09-25 16:18:28 +03:00
custom_emoji.txt	customs	2018-08-04 18:23:11 +02:00
dev.exs	Format the code.	2018-03-30 15:01:53 +02:00
emoji.txt	customs	2018-08-04 18:23:11 +02:00
prod.exs	Clean up prod.exs a bit.	2018-03-28 16:03:42 +02:00
test.exs	Migrate to comeonin 4 and Cachex 3	2018-05-20 20:08:40 +02:00