Ivan Tashkinov b27d8f7437 Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix ...

# Conflicts:
#	CHANGELOG.md

2020-11-19 19:35:44 +03:00

..

activity_pub

Merge branch 'chores/note-handling-move' into 'develop'

2020-11-17 14:16:53 +00:00

admin_api

[#2301] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.

2020-11-19 19:30:02 +03:00

api_spec

…

auth

…

common_api

…

endpoint

…

feed

escaping summary and other fields in xml templates

2020-11-10 10:46:57 +03:00

mastodon_api

Merge branch 'develop' into 'hide-muted-reactions'

2020-11-18 20:22:40 +00:00

media_proxy

…

metadata

[#2301] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.

2020-11-19 19:30:02 +03:00

o_auth

…

o_status

…

pleroma_api

Hide reactions from muted and blocked users

2020-11-16 22:50:14 +04:00

plugs

Remove unused aliases

2020-10-30 18:42:43 +04:00

preload/providers

…

push

Synchronize reaction notification text with PleromaFE's style

2020-11-17 20:22:24 +00:00

rich_media

…

static_fe

…

twitter_api

Password Resets: Don't accept tokens above a certain age.

2020-11-19 12:27:06 +01:00

views

…

web_finger

…

chat_channel_test.exs

…

common_api_test.exs

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope

2020-11-17 15:01:38 +01:00

fallback_test.exs

RedirectController: Don't replace title, but inject into the meta

2020-11-11 17:10:59 +01:00

federator_test.exs

…

media_proxy_test.exs

…

mongoose_im_controller_test.exs

…

node_info_test.exs

…

rel_me_test.exs

…

streamer_test.exs

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain

2020-11-04 15:05:01 +01:00

uploader_controller_test.exs

…

web_finger_test.exs

…