Ivan Tashkinov 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # lib/pleroma/web/media_proxy/media_proxy_controller.ex		2020-07-02 16:36:54 +03:00
..
activity/ir
bbs
chat
config	moving mrf settings from instance to separate group	2020-06-16 18:32:18 +03:00
conversation
docs
emails
emoji
federation
fixtures	Fetcher: Work when we can't get the OP.	2020-07-01 11:48:51 +02:00
http	added wrapper Pleroma.HTTP for ExAws.S3	2020-06-25 07:12:29 +03:00
instance_static	emoji pagination for pack show action	2020-06-18 18:50:03 +03:00
integration
mfa
migration_helper
object	Fetcher: Work when we can't get the OP.	2020-07-01 11:48:51 +02:00
plugs
pool
reverse_proxy
support	Merge branch 'features/users-raw_bio' into 'develop'	2020-06-17 10:34:23 +00:00
tasks	Merge develop	2020-06-23 20:56:55 +03:00
upload	Mogrify args as custom tuples	2020-06-16 15:53:28 +03:00
uploaders
user
web	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-02 16:36:54 +03:00
workers	fixes for tests	2020-06-16 19:03:45 +03:00
activity_expiration_test.exs
activity_test.exs
application_requirements_test.exs	fix tests	2020-06-23 09:08:24 +03:00
bookmark_test.exs
captcha_test.exs
chat_test.exs
config_test.exs
conversation_test.exs
earmark_renderer_test.exs
emoji_test.exs
exec_test.exs
filter_test.exs
following_relationship_test.exs
formatter_test.exs
healthcheck_test.exs
html_test.exs	excluding attachment links from RichMedia	2020-06-29 15:25:57 +03:00
http_test.exs	added wrapper Pleroma.HTTP for Tzdata.HTTPClient	2020-06-24 09:12:32 +03:00
job_queue_monitor_test.exs
keys_test.exs
list_test.exs
marker_test.exs
mfa_test.exs
moderation_log_test.exs
notification_test.exs	Notification: Remove TODO.	2020-06-29 17:52:56 +02:00
object_test.exs
otp_version_test.exs
pagination_test.exs
registration_test.exs
repo_test.exs	added verify RUM settings before start app	2020-06-22 17:27:49 +03:00
runtime_test.exs
safe_jsonb_set_test.exs
scheduled_activity_test.exs
signature_test.exs
stats_test.exs
test_helper.exs
upload_test.exs
user_invite_token_test.exs
user_relationship_test.exs
user_search_test.exs
user_test.exs	ActivityPub: Handle clashing nicknames for the same ap id	2020-07-01 12:26:07 +02:00
xml_builder_test.exs