lain 2480200759 Merge branch 'refactor/following-relationships' into 'develop' ...

Move following relationships to a separate table

Closes #1233

See merge request pleroma/pleroma!1814

2019-10-28 07:27:45 +00:00

..

account_controller.ex

Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships

2019-10-24 14:55:36 +07:00

emoji_api_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-10-06 17:12:17 +03:00

mascot_controller.ex

[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.

2019-10-16 21:59:21 +03:00

pleroma_api_controller.ex

Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count.

2019-10-26 02:29:18 +03:00

scrobble_controller.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