Commit graph

12 commits

Author SHA1 Message Date
Ivan Tashkinov 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage. 2019-12-15 22:32:42 +03:00
lain b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions 2019-11-08 13:27:11 +01:00
eugenijm 0580654485 Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count.
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
2019-10-26 02:29:18 +03:00
eugenijm 52ed2f8f2d Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read 2019-10-19 15:24:06 +03:00
lain d580eedfe9 Linting. 2019-10-07 12:40:33 +02:00
lain 73b6512907 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-07 12:30:59 +02:00
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
lain 4cb603e1df PleromaAPI: Add unreacting. 2019-10-02 18:19:16 +02:00
lain 391c736292 PleromaAPI: Fix emoji_reactions_by 2019-10-02 18:13:10 +02:00
lain 6068d2254e PleromaAPIController: Fixes and refactoring. 2019-09-30 15:13:25 +02:00
lain b923842e96 Merge remote-tracking branch 'origin/develop' into reactions 2019-09-30 13:57:54 +02:00
rinpatch 6b3d5ed6db Emoji API Controller: Follow phoenix directory structure 2019-09-23 21:14:51 +03:00
Renamed from lib/pleroma/web/pleroma_api/pleroma_api_controller.ex (Browse further)