Maxim Filippov 46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update		2019-11-11 19:18:12 +09:00
..
activity_pub	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-11 19:18:12 +09:00
admin_api	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-08 18:30:49 +09:00
auth
common_api	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-05 02:12:48 +03:00
feed	add subject to atom feed	2019-11-10 11:10:20 +03:00
instances
mastodon_api	Mastodon API: Add the recipients parameter to GET /api/v1/conversations	2019-11-07 08:26:24 +03:00
media_proxy
metadata	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
mongooseim
oauth	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
ostatus	tests: ostatus controller tests: fix sporadic compilation failure	2019-10-19 23:16:15 +00:00
pleroma_api/controllers	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation	2019-10-20 22:29:56 +03:00
plugs
push	Spelling	2019-10-21 18:35:43 -05:00
rich_media
streamer	Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.	2019-11-04 18:36:16 +03:00
twitter_api	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
views
web_finger	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
fallback_test.exs
federator_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
masto_fe_controller_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
node_info_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
rel_me_test.exs	add missing tesla mocks	2019-11-04 15:18:32 +00:00
uploader_controller_test.exs