Ivan Tashkinov 908cf22a6c Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex		2020-04-28 19:56:20 +03:00
..
activity_pub	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks	2020-04-28 19:56:20 +03:00
admin_api	Merge branch 'feature/1584-client-captcha-options' into 'develop'	2020-04-17 09:19:35 +00:00
api_spec	Support validation for inline OpenAPI schema and automatic tests for examples	2020-04-24 15:16:15 +04:00
auth	[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.	2020-04-24 16:52:38 +03:00
common_api	Announcements: Prevent race condition.	2020-04-24 14:37:53 +02:00
feed	fix for use of published from different entities	2020-04-16 18:05:36 +03:00
instances
mastodon_api	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks	2020-04-28 19:56:20 +03:00
media_proxy
metadata	restrict remote users from indexing	2020-04-01 09:57:12 +03:00
mongooseim	formating	2020-04-28 01:29:31 +02:00
oauth
ostatus
pleroma_api/controllers	[#2409] Made GET /api/v1/accounts/:id/favourites auth-optional, adjusted tests.	2020-04-24 22:25:27 +03:00
plugs
push	WebPush: Return proper values for jobs.	2020-04-22 13:28:34 +02:00
rich_media
static_fe
streamer	Streamer: Stream boosts to the boosting user.	2020-04-22 17:21:13 +02:00
twitter_api	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks	2020-04-28 19:56:20 +03:00
views
web_finger
chat_channel_test.exs
fallback_test.exs
federator_test.exs	Federator: Return proper values for jobs	2020-04-22 13:28:52 +02:00
masto_fe_controller_test.exs
node_info_test.exs
rel_me_test.exs
uploader_controller_test.exs