Henry Jameson 4174bc6126 Merge remote-tracking branch 'origin/develop' into shigusegubu ... * origin/develop: (566 commits) Fix MRF reject for ChatMessage Create MRF.filter_pipeline to inject :object_data when present KeywordPolicy: Still match when fields are absent pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d CHANGELOG.md: Add 2.1.2 entry mix.exs: bump version to 2.1.2 Merge branch '2130-mfa-users-oauth-login-fix' into 'develop' Merge branch 'fix/streaming-termination-errors' into 'develop' Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' Merge branch 'reply-visibility-user-guard' into 'develop' Merge branch 'bugfix/mrf-ingestion' into 'develop' adapt to new user factory behavior add test and changelog entry User search respect discoverable flag Merge branch 'hotfix/rich-media-compile-error' into 'develop' Merge branch 'feat/rich-media-head' into 'develop' Deny ConfigDB migration when deprecated settings found RichMedia: Fix log spam on failures and resetting TTL on cached errors Return the file content for `GET /api/pleroma/admin/instance_document/:document_name` add description to changelog ...		2020-09-17 23:40:53 +03:00
..
benchmark.exs	activities generation tasks	2020-03-30 11:42:25 +03:00
config.exs	Merge remote-tracking branch 'origin/develop' into shigusegubu	2020-09-17 23:40:53 +03:00
custom_emoji.txt	updates	2019-04-28 18:32:58 +03:00
description.exs	Remove :managed_config option.	2020-09-14 18:04:16 +03:00
dev.exs	Enable strict validation mode in dev and test environments	2020-05-04 22:35:28 +04:00
docker.exs	Remove dynamic config as default, add healthcheck	2019-09-03 09:31:52 -04:00
dokku.exs	CI: Add auto-deployment via dokku.	2019-05-31 10:55:35 +02:00
emoji.txt	Remove longfox emoji set	2019-08-04 04:32:45 +00:00
prod.exs	Set Logger level to :info in prod	2019-12-09 19:11:54 +07:00
releases.exs	some refactor and tests	2020-01-21 18:42:00 +03:00
test.exs	test: remove extraneous :instances_favicons config bits	2020-09-08 16:32:54 +02:00