Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		2019-10-02 20:42:40 +03:00
..
activity_pub	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
admin_api	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
auth
channels
common_api	common api: add some missing IR bits for listen activities' children	2019-09-30 10:39:48 +00:00
federator
mailer
mastodon_api	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
media_proxy
metadata
mongooseim
nodeinfo	A feature for shareable emoji packs, use it in download_from & tests	2019-09-19 00:16:33 +03:00
oauth	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
ostatus	Clean up views	2019-09-23 22:33:59 +00:00
pleroma_api/controllers	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
push	Revert subscription refactoring.	2019-09-29 18:43:27 +03:00
rich_media	added prepare html for RichMedia.Parser	2019-09-15 14:53:58 +03:00
salmon
streamer	remove remaining errors from tests	2019-09-17 14:44:52 +00:00
templates
twitter_api	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
views	Extract status actions from MastodonAPIController into StatusController	2019-09-27 10:51:15 +07:00
web_finger
websub	Replace Pleroma.FlakeId with flake_id hex package	2019-09-25 17:14:31 +07:00
xml
chat_channel.ex	Fix merge	2019-09-30 19:10:54 +07:00
controller_helper.ex	Add PleromaAPI.AccountController	2019-09-30 19:10:55 +07:00
endpoint.ex	Add remote_ip plug	2019-09-27 21:59:23 +00:00
fallback_redirect_controller.ex
gettext.ex
metadata.ex
oauth.ex
rel_me.ex
router.ex	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
translation_helpers.ex
uploader_controller.ex
web.ex