Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex		2019-12-04 18:56:31 +03:00
..
activity_pub	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
admin_api	Cleanup tests output	2019-11-28 16:44:48 +07:00
auth	Refactored Pleroma.Web.Auth.Authenticator	2019-05-01 13:28:04 +00:00
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	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
mastodon_api	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
media_proxy	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
metadata	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
mongooseim	MongooseIM: Add basic integration endpoints.	2019-05-17 18:21:11 +02:00
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	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
push	Spelling	2019-10-21 18:35:43 -05:00
rich_media	test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1	2019-08-20 20:20:12 +00:00
static_fe	Support redirecting by activity UUID in static FE as well.	2019-11-13 08:22:11 -08:00
streamer	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-29 10:17:59 +03:00
twitter_api	[#1335] User: refactored :blocks field into :blocked_users relation.	2019-11-10 16:30:21 +03:00
views	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
web_finger	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
fallback_test.exs	[#1097] added redirect: /pleroma/admin -> /pleroma/admin/	2019-07-26 20:27:38 +00:00
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	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00