lain aa9fe3a712 Merge branch 'develop' into 'feature/tag_feed' ... # Conflicts: # CHANGELOG.md		2020-01-15 14:29:56 +00:00
..
activity_pub	Merge branch 'develop' into issue/1354	2020-01-12 12:12:15 -06:00
admin_api	Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'	2019-12-12 09:28:27 +00:00
auth
channels
common_api	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
federator	Set log level to debug for not important messages	2019-12-11 17:47:19 +07:00
feed	add tag feeds	2019-12-18 09:19:37 +03:00
mailer
mastodon_api	Merge branch 'develop' into notifications-from-account	2020-01-15 16:49:45 +04:00
media_proxy	Fix/mediaproxy whitelist base url	2019-08-02 17:07:09 +00:00
metadata	Merge branch 'develop' into feature/tag_feed	2020-01-14 21:29:14 +03:00
mongooseim
nodeinfo
oauth	[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).	2019-12-12 16:00:06 +03:00
ostatus	OStatus controller: don't serve json at /notice/, redirect instead	2019-11-25 17:55:17 +03:00
pleroma_api/controllers	OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.	2019-12-15 22:32:42 +03:00
push	Merge branch 'develop' into issue/1342	2019-12-05 15:46:27 +03:00
rich_media
static_fe
streamer
templates	Merge branch 'develop' into feature/tag_feed	2020-01-14 21:29:14 +03:00
twitter_api	Merge branch 'develop' into issue/1354	2020-01-12 12:12:15 -06:00
views
web_finger
xml
chat_channel.ex	ChatChannel: Ignore messages that are too long.	2019-12-04 12:48:34 +01:00
controller_helper.ex	add tag feeds	2019-12-18 09:19:37 +03:00
endpoint.ex	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-10 00:16:43 +07:00
fallback_redirect_controller.ex
gettext.ex
masto_fe_controller.ex	[#2068] Introduced proper OAuth tokens usage to controller tests.	2019-12-19 17:23:27 +03:00
metadata.ex
oauth.ex
rel_me.ex
router.ex	Merge branch 'develop' into feature/tag_feed	2020-01-14 21:29:14 +03:00
translation_helpers.ex
uploader_controller.ex
web.ex