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_pub	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-26 10:42:36 +03:00
admin_api	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-25 01:46:18 +09:00
auth
common_api	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	2019-11-20 15:46:11 +03:00
feed	add subject to atom feed	2019-11-10 11:10:20 +03:00
instances
mastodon_api	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-21 16:47:52 +03:00
media_proxy
metadata	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
mongooseim
oauth	Check client and token in GET /oauth/authorize	2019-11-05 23:52:47 +09:00
ostatus	OStatus controller: don't serve json at /notice/, redirect instead	2019-11-25 17:55:17 +03:00
pleroma_api/controllers	Merge remote-tracking branch 'origin/develop' into reactions	2019-11-08 13:27:11 +01:00
plugs
push	Spelling	2019-10-21 18:35:43 -05:00
rich_media
static_fe	Support redirecting by activity UUID in static FE as well.	2019-11-13 08:22:11 -08:00
streamer	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00
twitter_api	[#1335] User: refactored :blocks field into :blocked_users relation.	2019-11-10 16:30:21 +03: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	Add test	2019-11-15 23:55:28 +09:00
rel_me_test.exs	add missing tesla mocks	2019-11-04 15:18:32 +00:00
uploader_controller_test.exs