akkoma/lib/pleroma/web
Ivan Tashkinov 049ece1ef3 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex
2020-10-17 13:12:39 +03:00
..
activity_pub Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 2020-10-17 13:12:39 +03:00
admin_api Apply 1 suggestion(s) to 1 file(s) 2020-10-15 21:03:48 +00:00
api_spec Apply 3 suggestion(s) to 3 file(s) 2020-10-14 19:33:54 +00:00
auth alias alphabetically order 2020-10-13 16:43:59 +03:00
channels
common_api alias alphabetically order 2020-10-13 16:43:59 +03:00
fallback InstanceStatic module name 2020-10-13 16:43:55 +03:00
fed_sockets changes after rebase 2020-10-13 16:44:03 +03:00
federator other files consistency 2020-10-13 16:38:19 +03:00
feed Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 2020-10-17 13:12:39 +03:00
mailer Add missing Copyright headers 2020-10-12 12:00:50 -05:00
mastodon_api Merge branch 'develop' into refactor/discoverable_user_field 2020-10-15 16:39:01 -05:00
media_proxy other files consistency 2020-10-13 16:38:19 +03:00
metadata Merge branch 'develop' into refactor/discoverable_user_field 2020-10-13 09:54:11 -05:00
mongoose_im alias alphabetically order 2020-10-13 16:43:59 +03:00
nodeinfo Nodeinfo: Add chat information back in. 2020-06-26 13:04:15 +02:00
o_auth alias alphabetically order 2020-10-13 16:43:59 +03:00
o_status Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 2020-10-17 13:12:39 +03:00
pleroma_api Merge branch 'develop' into feature/gen-magic 2020-10-13 10:08:38 -05:00
plugs fixes after rebase 2020-10-13 16:44:02 +03:00
preload/providers fix after rebase 2020-10-13 16:44:00 +03:00
push more files renamings 2020-10-13 16:38:19 +03:00
rich_media more files renamings 2020-10-13 16:38:19 +03:00
static_fe EnsureAuthenticatedPlug module name 2020-10-13 16:43:57 +03:00
templates Merge branch '2130-mfa-users-oauth-login-fix' into 'develop' 2020-09-17 19:51:54 +03:00
twitter_api alias alphabetically order 2020-10-13 16:43:59 +03:00
views Add missing Copyright headers 2020-10-12 12:00:50 -05:00
web_finger FederatingPlug module name 2020-10-13 16:43:55 +03:00
api_spec.ex OpenAPI: make it possible to generate a spec without starting the app 2020-09-19 16:26:15 +03:00
chat_channel.ex [#2791] AccountView: renamed :force option to :skip_visibility_check. 2020-07-23 15:08:30 +03:00
common_api.ex other files consistency 2020-10-13 16:38:19 +03:00
controller_helper.ex added paginate links to headers for /chats/:id/messages 2020-09-10 12:39:29 +03:00
embed_controller.ex
endpoint.ex fixes after rebase 2020-10-13 16:44:02 +03:00
fed_sockets.ex changes after rebase 2020-10-13 16:44:03 +03:00
federator.ex other files consistency 2020-10-13 16:38:19 +03:00
gettext.ex
instance_document.ex Return the file content for GET /api/pleroma/admin/instance_document/:document_name 2020-09-17 16:55:53 +03:00
masto_fe_controller.ex alias alphabetically order 2020-10-13 16:43:59 +03:00
media_proxy.ex other files consistency 2020-10-13 16:38:19 +03:00
metadata.ex Metadata: Move restriction check from Feed provider to activated_providers 2020-09-08 20:21:34 +03:00
o_auth.ex oauth consistency 2020-10-13 16:38:18 +03:00
plug.ex more files renamings 2020-10-13 16:38:19 +03:00
preload.ex add status_net/config 2020-06-03 16:34:03 -04:00
push.ex more files renamings 2020-10-13 16:38:19 +03:00
rel_me.ex passing adapter options directly without adapter key 2020-09-07 19:59:17 +03:00
router.ex Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 2020-10-17 13:12:39 +03:00
streamer.ex changes after rebase 2020-10-13 17:10:34 +03:00
translation_helpers.ex
uploader_controller.ex
web_finger.ex more files renamings 2020-10-13 16:38:19 +03:00
xml.ex more files renamings 2020-10-13 16:38:19 +03:00