244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
46f7e51b27
Merge branch 'add-muted-to-notifications' into 'develop'
...
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
2020-06-22 15:40:09 +00:00
b3a549e916
Update NotificationOperation spec
2020-06-22 19:18:33 +04:00
59bdef0c33
Merge branch 'feature/1739-account-endpoints' into 'develop'
...
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
2020-06-22 12:37:10 +00:00
93ae1c8bd3
Merge branch 'feature/1854-emoji-pagination' into 'develop'
...
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
2020-06-22 08:41:09 +00:00
b5f13af7ba
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20 10:59:08 +00:00
0e789bc55f
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20 09:39:50 +00:00
02ca8a363f
default page size for files
2020-06-19 14:46:38 +03:00
4975ed86bc
emoji pagination for pack show action
2020-06-18 18:50:03 +03:00
3becdafd33
emoji packs pagination
2020-06-18 14:32:21 +03:00
3462d4b995
Merge branch 'develop' into issue/1855
2020-06-17 12:50:06 -05:00
d4b5a9730e
Remove `poll` from `notification_type` OpenAPI spec
2020-06-17 18:47:59 +04:00
579763126f
Merge branch 'develop' into issue/1855
2020-06-15 15:24:55 +03:00
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
2020-06-13 17:20:43 +00:00
f9dcf15ecb
added admin api for MediaProxy cache invalidation
2020-06-12 14:49:54 +03:00
063e6b9841
StatusController: Correctly paginate favorites.
...
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
2020-06-09 10:53:40 +02:00
064c4f86f3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-09 09:36:07 +02:00
fe2a5d0614
ChatController: Make last_read_id mandatory.
2020-06-07 20:22:08 +02:00
801e668a97
ChatController: Add `last_read_id` option to mark_as_read.
2020-06-07 15:38:33 +02:00
f4cf4ae16e
ChatController: Use new oauth scope *:chats.
2020-06-06 16:48:02 +02:00
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
d44da91bbf
SubscriptionOperation: Let chat mentions through.
2020-06-04 20:28:33 +02:00
b57e4ad1ab
Merge branch 'develop' into 'openapi/admin/relay'
...
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-06-04 13:29:32 +00:00
70f054b083
Merge branch 'develop' into openapi/admin/relay
2020-06-04 13:30:14 +04:00
b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
2020-06-04 13:28:00 +04:00
b3407344d3
ChatController: Add function to mark single message as read.
2020-06-03 19:21:23 +02:00
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
2020-06-03 19:17:05 +04:00
7922e63825
Update OpenAPI spec for AdminAPI.StatusController
2020-06-02 19:08:09 +04:00
68cb152a08
Merge branch 'develop' into openapi/admin/relay
2020-06-02 18:50:37 +04:00
5da38c15cd
Merge branch 'openapi/admin/oauth-apps' into 'develop'
...
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
2020-06-02 14:13:24 +00:00
6977500ef7
Merge branch 'tagline' into 'develop'
...
Update default instance description
See merge request pleroma/pleroma!2600
2020-06-02 14:10:53 +00:00
805ab86933
Notifications: Make notifications save their type.
2020-06-02 13:24:34 +02:00
06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
2020-05-28 23:11:12 +04:00
d4a18d44fe
Update default instance description
2020-05-28 11:56:30 -05:00
c6290be682
Fix typo
2020-05-27 14:42:21 +04:00
fca48154a2
Add AdminAPI.InviteView
2020-05-26 15:21:33 +04:00
2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
2020-05-26 15:03:07 +04:00
95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
2020-05-26 15:03:07 +04:00
0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
2020-05-25 22:04:06 +04:00
cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
2020-05-25 16:51:16 +04:00
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-25 13:57:27 +02:00
ec470c4c77
Merge branch 'openapi/admin/status' into 'develop'
...
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
2020-05-25 11:40:54 +00:00
1fa7aa9fc5
Merge branch 'emoji-react-better-errors' into 'develop'
...
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
2020-05-22 14:36:08 +00:00
ba106aa9c8
Fix notifications mark as read API
2020-05-22 18:15:36 +04:00
bcb549531f
EmojiReactionController: Return more appropriate error.
2020-05-22 14:38:28 +02:00
578ed3a37f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:35:13 +02:00
f166316f50
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
...
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
2020-05-21 13:30:09 +00:00
45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
2020-05-21 17:23:12 +04:00
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:00:05 +02:00
265746b21f
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
...
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
2020-05-20 12:08:28 +00:00
Haelwenn (lanodan) Monnier