Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		2019-10-06 11:43:49 +03:00
..
activity/ir
bbs
config
conversation	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-05 20:12:00 +03:00
daemons
emails
emoji
fixtures	Add test for handling Announces with inlined object from different origin	2019-10-05 13:56:40 +02:00
http
instance_static/emoji
integration	Extract status actions from MastodonAPIController into StatusController	2019-09-27 10:51:15 +07:00
object
plugs	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
support	Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 11:43:49 +03:00
tasks	Merge branch 'refactor/user' into 'develop'	2019-09-26 03:00:38 +00:00
upload
uploaders
web	Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 11:43:49 +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
formatter_test.exs	Merge branch 'develop' into issue/1218	2019-09-25 12:24:12 +03:00
healthcheck_test.exs	Add Pleroma.JobQueueMonitor	2019-09-26 18:49:57 +07:00
html_test.exs
http_test.exs
job_queue_monitor_test.exs	Add tests for Pleroma.JobQueueMonitor	2019-10-02 15:24:21 +07:00
keys_test.exs
list_test.exs	Fix merge	2019-09-30 19:10:54 +07:00
moderation_log_test.exs
notification_test.exs	Revert subscription refactoring.	2019-09-29 18:43:27 +03:00
object_test.exs
pagination_test.exs
registration_test.exs
repo_test.exs
reverse_proxy_test.exs	Track failed proxy urls and don't request them again	2019-10-01 20:00:27 +00:00
scheduled_activity_test.exs
signature_test.exs
test_helper.exs
upload_test.exs
user_info_test.exs
user_invite_token_test.exs
user_search_test.exs
user_test.exs	Fix get_cached_by_nickname_or_id not allowing to get local users by	2019-10-04 14:44:09 +03:00
xml_builder_test.exs