Ivan Tashkinov c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex		2019-11-26 10:42:36 +03:00
..
activity/ir
bbs
config
conversation	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00
daemons
emails
emoji
fixtures
http	add ability to set a custom user-agent string	2019-11-25 09:53:11 +00:00
instance_static/emoji
integration
object	Containment: Add a catch-all clause to contain_origin.	2019-11-12 12:07:17 +01:00
plugs	Support authentication via x-admin-token HTTP header	2019-11-19 15:58:20 +07:00
support	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	2019-11-20 15:46:11 +03:00
tasks
upload
uploaders
web	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-26 10:42:36 +03:00
activity_expiration_test.exs
activity_test.exs
bookmark_test.exs
captcha_test.exs
config_test.exs
conversation_test.exs
emoji_test.exs
filter_test.exs
following_relationship_test.exs
formatter_test.exs
healthcheck_test.exs
html_test.exs
http_test.exs
job_queue_monitor_test.exs
keys_test.exs
list_test.exs
marker_test.exs
moderation_log_test.exs
notification_test.exs	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00
object_test.exs
pagination_test.exs
registration_test.exs
repo_test.exs
reverse_proxy_test.exs
safe_jsonb_set_test.exs
scheduled_activity_test.exs
signature_test.exs
test_helper.exs
upload_test.exs
user_invite_token_test.exs
user_relationship_test.exs	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	2019-11-20 15:46:11 +03:00
user_search_test.exs
user_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-21 16:47:52 +03:00
xml_builder_test.exs