Ivan Tashkinov c8e7ace812 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements ... # Conflicts: # CHANGELOG.md		2020-12-07 21:45:04 +03:00
..
activity_pub	SideEffects: fix test	2020-12-02 14:48:11 +01:00
admin_api	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-12-07 21:45:04 +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 remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-12-06 13:59:35 +03: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	[#3112] Allowed revoking same-user token from any apps. Added tests.	2020-11-30 21:55:48 +03:00
o_status
pleroma_api	[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.	2020-12-06 13:59:10 +03:00
plugs	[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.	2020-12-06 13:59:10 +03: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	Use Jason instead of Poison in tests	2020-11-23 13:28:55 -06:00
media_proxy_test.exs
mongoose_im_controller_test.exs
node_info_test.exs
rel_me_test.exs
streamer_test.exs	Use Jason instead of Poison in tests	2020-11-23 13:28:55 -06:00
uploader_controller_test.exs
web_finger_test.exs