Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs		2020-05-13 12:42:36 +03:00
..
activity_pub	Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'	2020-05-12 16:45:46 +00:00
admin_api	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-13 12:42:36 +03:00
api_spec	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-13 12:42:36 +03:00
auth	Upgrade Comeonin to v5	2020-05-12 17:14:59 -05:00
channels
common_api	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
federator	Federator: Return proper values for jobs	2020-04-22 13:28:52 +02:00
feed
mailer
mastodon_api	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-13 12:42:36 +03:00
media_proxy
metadata
mongooseim	Upgrade Comeonin to v5	2020-05-12 17:14:59 -05:00
nodeinfo
oauth	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00
ostatus
pleroma_api/controllers	[#2456] Removed support for embedded relationships in account view.	2020-05-10 09:16:48 +03:00
push	Hide the sender when privacy option is enabled	2020-05-06 16:42:27 -05:00
rich_media
static_fe
streamer	Expand and authorize streams in Streamer directly	2020-05-12 18:04:47 +02:00
templates	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00
twitter_api	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00
views	Streamer: Fix wrong argument order when rendering activities to authenticated user	2020-05-07 16:13:24 +03:00
web_finger	Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'	2020-05-06 08:46:45 +00:00
xml	Update Copyrights	2020-03-03 16:44:49 -06:00
api_spec.ex	Add OpenAPI spec for SubscriptionController	2020-05-05 16:43:00 +04:00
chat_channel.ex	[#2456] Removed support for embedded relationships in account view.	2020-05-10 09:16:48 +03:00
controller_helper.ex	[#2456] Added support for embed_relationships param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.	2020-05-12 19:14:35 +03:00
endpoint.ex	static-fe.css: Restore and move to /priv/static/static-fe	2020-05-02 08:28:42 +02:00
fallback_redirect_controller.ex
gettext.ex
masto_fe_controller.ex
metadata.ex
oauth.ex
rel_me.ex
router.ex	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00
translation_helpers.ex
uploader_controller.ex
web.ex