Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks ... # Conflicts: # lib/pleroma/user.ex		2020-01-10 16:18:32 +03:00
..
activity_pub	Do not crash when remote user follower and following counters are hidden	2019-12-19 19:26:46 +07:00
admin_api	OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.	2019-12-15 22:32:42 +03: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	Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"	2019-12-21 11:41:19 +00:00
media_proxy
metadata	Posts without media attachments should get the Summary TwitterCard	2019-12-20 16:32:04 -06:00
mongooseim
oauth	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks	2020-01-10 16:18:32 +03: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 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks	2020-01-10 16:18:32 +03:00
plugs
push	added privacy option to push notifications	2019-11-28 22:13:11 +03:00
rich_media
static_fe	Support redirecting by activity UUID in static FE as well.	2019-11-13 08:22:11 -08:00
streamer	formatting	2019-12-16 01:37:33 +03:00
twitter_api	tests: remove a useless 1 second sleep	2019-12-16 00:51:59 +03:00
views
web_finger	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
chat_channel_test.exs	ChatChannel: Ignore messages that are too long.	2019-12-04 12:48:34 +01: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	[#2068] Introduced proper OAuth tokens usage to controller tests.	2019-12-19 17:23:27 +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