Pleroma/lib/pleroma/web
Ivan Tashkinov 4e14945670 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/activity_pub/activity_pub.ex
2021-02-03 09:31:38 +03:00
..
activity_pub Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-02-03 09:31:38 +03:00
admin_api Merge branch 'develop' into refactor/deactivated_user_field 2021-01-18 14:58:21 -06:00
api_spec Merge branch 'develop' into 'fix/2411-mutes-api' 2021-02-02 17:57:58 +00:00
auth Remove toggle_confirmation; require explicit state change 2021-01-15 13:11:51 -06:00
channels Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
common_api Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
fallback Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
federator Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
feed Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-01-13 22:11:16 +03:00
mailer Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
mastodon_api Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-02-03 09:31:38 +03:00
media_proxy rename function 2021-01-21 14:41:28 -06:00
metadata Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
mongoose_im Change user.deactivated field to user.is_active 2021-01-15 11:24:46 -06:00
nodeinfo Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
o_auth Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
o_status Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
pleroma_api Change user.deactivated field to user.is_active 2021-01-15 11:24:46 -06:00
plugs Add active user count 2021-01-27 18:20:06 +04:00
preload/providers Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
push Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
rich_media Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
static_fe Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
templates Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-02-03 09:31:38 +03:00
twitter_api Merge branch 'develop' into refactor/deactivated_user_field 2021-01-18 14:58:21 -06:00
views Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube). 2021-01-28 19:49:43 +03:00
web_finger Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
api_spec.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
chat_channel.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
common_api.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
controller_helper.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
embed_controller.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
endpoint.ex like this 2021-01-29 15:55:00 +03:00
federator.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
gettext.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
instance_document.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
masto_fe_controller.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
media_proxy.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
metadata.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
o_auth.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
plug.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
preload.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
push.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
rel_me.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
router.ex Merge branch 'email-stub-in-verify-credentials' into 'develop' 2021-02-02 18:35:08 +00:00
streamer.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
translation_helpers.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
uploader_controller.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
web_finger.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00
xml.ex Bump Copyright to 2021 2021-01-13 07:49:50 +01:00