kaniini 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop' ... Add the `unread_conversation_count` field to the user info See merge request pleroma/pleroma!1737		2019-10-04 17:33:18 +00:00
..
activity_pub	ActivityPub: Change addressing of Undo.	2019-10-04 16:32:42 +02:00
admin_api	Fix merge	2019-09-30 19:10:54 +07:00
auth	…
channels	Use `User.get_cached*` everywhere	2019-04-22 07:20:43 +00:00
common_api	Rename misleading `get_announce_visibility` to `public_announce?`	2019-10-02 10:48:34 +02:00
federator	…
mailer	…
mastodon_api	Merge branch 'user-info-unread-direct-conversation' into 'develop'	2019-10-04 17:33:18 +00:00
media_proxy	…
metadata	added Emoji.Formatter	2019-08-30 22:04:17 +03:00
mongooseim	…
nodeinfo	A feature for shareable emoji packs, use it in download_from & tests	2019-09-19 00:16:33 +03:00
oauth	Fix OAuthController	2019-10-04 13:30:46 +07:00
ostatus	Clean up views	2019-09-23 22:33:59 +00:00
pleroma_api/controllers	Extract mascot actions from `MastodonAPIController` to MascotController	2019-09-30 19:32:43 +07:00
push	Revert subscription refactoring.	2019-09-29 18:43:27 +03:00
rich_media	…
salmon	…
streamer	…
templates	Add MastoFEController	2019-10-02 20:36:08 +07:00
twitter_api	…
views	Add MastoFEController	2019-10-02 20:36:08 +07:00
web_finger	…
websub	…
xml	…
chat_channel.ex	Fix merge	2019-09-30 19:10:54 +07:00
controller_helper.ex	Extract poll actions from `MastodonAPIController` to `PollController`	2019-10-01 11:44:34 +07:00
endpoint.ex	…
fallback_redirect_controller.ex	[#1097] added redirect: /pleroma/admin -> /pleroma/admin/	2019-07-26 20:27:38 +00:00
gettext.ex	…
masto_fe_controller.ex	Add MastoFEController	2019-10-02 20:36:08 +07:00
metadata.ex	…
oauth.ex	…
rel_me.ex	…
router.ex	Add MastoFEController	2019-10-02 20:36:08 +07:00
translation_helpers.ex	Discard identifier, if empty	2019-10-01 19:43:22 +03:00
uploader_controller.ex	…
web.ex	…