minibikini
|
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 |
|
Egor Kislitsyn
|
70f054b083
|
Merge branch 'develop' into openapi/admin/relay
|
2020-06-04 13:30:14 +04:00 |
|
Egor Kislitsyn
|
b4d5bdd6f1
|
Merge branch 'develop' into openapi/admin/config
|
2020-06-04 13:28:00 +04:00 |
|
lain
|
b3407344d3
|
ChatController: Add function to mark single message as read.
|
2020-06-03 19:21:23 +02:00 |
|
Egor Kislitsyn
|
c16315d055
|
Add OpenAPI spec for AdminAPI.ReportController
|
2020-06-03 19:17:05 +04:00 |
|
Egor Kislitsyn
|
7922e63825
|
Update OpenAPI spec for AdminAPI.StatusController
|
2020-06-02 19:08:09 +04:00 |
|
Egor Kislitsyn
|
68cb152a08
|
Merge branch 'develop' into openapi/admin/relay
|
2020-06-02 18:50:37 +04:00 |
|
lain
|
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 |
|
lain
|
6977500ef7
|
Merge branch 'tagline' into 'develop'
Update default instance description
See merge request pleroma/pleroma!2600
|
2020-06-02 14:10:53 +00:00 |
|
lain
|
805ab86933
|
Notifications: Make notifications save their type.
|
2020-06-02 13:24:34 +02:00 |
|
Egor Kislitsyn
|
06f20e9181
|
Add OpenApi spec to AdminAPI.ConfigController
|
2020-05-28 23:11:12 +04:00 |
|
Alex Gleason
|
d4a18d44fe
|
Update default instance description
|
2020-05-28 11:56:30 -05:00 |
|
Mark Felder
|
9eea800026
|
Refactor notification settings
|
2020-05-28 10:16:09 -05:00 |
|
Egor Kislitsyn
|
c6290be682
|
Fix typo
|
2020-05-27 14:42:21 +04:00 |
|
Egor Kislitsyn
|
fca48154a2
|
Add AdminAPI.InviteView
|
2020-05-26 15:21:33 +04:00 |
|
Egor Kislitsyn
|
2a4f965191
|
Add OpenAPI spec for AdminAPI.InviteTokenController
|
2020-05-26 15:03:07 +04:00 |
|
Egor Kislitsyn
|
95ebfb9190
|
Move invite actions to AdminAPI.InviteTokenController
|
2020-05-26 15:03:07 +04:00 |
|
Egor Kislitsyn
|
0ba1f2631a
|
Add OpenAPI spec for AdminAPI.OAuthAppContoller
|
2020-05-25 22:04:06 +04:00 |
|
Egor Kislitsyn
|
cbcd592300
|
Add OpenAPI spec for AdminAPI.RelayController
|
2020-05-25 16:51:16 +04:00 |
|
lain
|
ee35bb5ac2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-25 13:57:27 +02:00 |
|
lain
|
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 |
|
rinpatch
|
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 |
|
Egor Kislitsyn
|
ba106aa9c8
|
Fix notifications mark as read API
|
2020-05-22 18:15:36 +04:00 |
|
lain
|
bcb549531f
|
EmojiReactionController: Return more appropriate error.
|
2020-05-22 14:38:28 +02:00 |
|
lain
|
578ed3a37f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:35:13 +02:00 |
|
lain
|
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 |
|
Egor Kislitsyn
|
45d2c4157f
|
Add OpenAPI spec for AdminAPI.StatusController
|
2020-05-21 17:23:12 +04:00 |
|
lain
|
814c3e5171
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:00:05 +02:00 |
|
lain
|
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 |
|
Egor Kislitsyn
|
26f01744bc
|
Add background_image to InstanceOperation
|
2020-05-20 15:18:58 +04:00 |
|
Egor Kislitsyn
|
5ba6e1c322
|
Move notification actions to PleromaAPI.NotificationController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
f3fc8b22b1
|
Move conversation actions to PleromaAPI.ConversationController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
9a5de0f454
|
Move reaction actions to EmojiReactionController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
490a3a34b6
|
Add OpenAPI spec for PleromaAPI.PleromaAPIController
|
2020-05-20 15:15:13 +04:00 |
|
Haelwenn
|
94ba5a7802
|
Merge branch 'exposed-background-image' into 'develop'
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
|
2020-05-20 10:53:54 +00:00 |
|
lain
|
8a6ddf26ac
|
InstanceOperation: Add background image to example
|
2020-05-20 12:12:07 +02:00 |
|
Egor Kislitsyn
|
47ed9ee441
|
Fix summary
|
2020-05-19 17:29:58 +04:00 |
|
Egor Kislitsyn
|
524d04d921
|
Add OpenAPI spec for PleromaAPI.ScrobbleController
|
2020-05-19 16:26:06 +04:00 |
|
Egor Kislitsyn
|
e4c720f14c
|
Fix typo
|
2020-05-19 14:59:50 +04:00 |
|
Egor Kislitsyn
|
fe5d423b43
|
Add OpenAPI spec for MascotController
|
2020-05-18 22:01:18 +04:00 |
|
Egor Kislitsyn
|
45c3a72404
|
[OpenAPI] Use BooleanLike in all request bodies
|
2020-05-18 20:58:59 +04:00 |
|
lain
|
0d417e005d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-18 18:38:32 +02:00 |
|
Ivan Tashkinov
|
5735b5c8be
|
Fixed missing support for with_muted param in direct timeline.
|
2020-05-18 19:00:00 +03:00 |
|
Egor Kislitsyn
|
aef31c69df
|
Rename EmojiAPIController to EmojiPackController
|
2020-05-18 19:43:25 +04:00 |
|
Egor Kislitsyn
|
6e4de715b3
|
Add OpenAPI spec for PleromaAPI.EmojiAPIController
|
2020-05-18 19:28:46 +04:00 |
|
Alexander Strizhakov
|
b1aa402229
|
removing 410 status
|
2020-05-18 10:34:50 +03:00 |
|
Alexander Strizhakov
|
e7bc2f980c
|
account visibility
|
2020-05-18 10:34:49 +03:00 |
|
lain
|
9c17109765
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-17 12:14:49 +02:00 |
|
lain
|
4b28d812cf
|
Merge branch 'restricted-relations-embedding' into 'develop'
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
|
2020-05-17 07:26:51 +00:00 |
|
lain
|
d96f8f17e8
|
Merge branch 'features/mastoapi_v2_media' into 'develop'
MastodonAPI: /api/v2/media endpoints
See merge request pleroma/pleroma!2439
|
2020-05-16 17:13:38 +00:00 |
|
lain
|
f012c3a202
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-15 13:33:04 +02:00 |
|
lain
|
1d18721a3c
|
Chats: Add updated_at to Schema and docs.
|
2020-05-15 13:18:41 +02:00 |
|
Egor Kislitsyn
|
e090191d03
|
[OpenAPI] Mark all not required request fields as nullable
|
2020-05-15 14:55:41 +04:00 |
|
Egor Kislitsyn
|
0f885b4b86
|
Fix OpenAPI spec
|
2020-05-14 16:18:30 +04:00 |
|
Haelwenn (lanodan) Monnier
|
099e314a1b
|
Add OpenAPISpex for MediaController
|
2020-05-14 12:13:25 +02:00 |
|
lain
|
359d7b0a6d
|
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
|
2020-05-14 09:09:11 +00:00 |
|
lain
|
1c2629328d
|
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
|
2020-05-14 09:07:09 +00:00 |
|
Ivan Tashkinov
|
8062d590dd
|
[#2456] OpenAPI-related tweaks. Removed support for with_relationships param in GET /api/v1/accounts/search.
|
2020-05-13 18:56:45 +03:00 |
|
Egor Kislitsyn
|
6802dc28ba
|
Add OpenAPI spec for PleromaAPI.AccountController
|
2020-05-13 19:06:46 +04:00 |
|
lain
|
0f0acc740d
|
Chat: Allow posting without content if an attachment is present.
|
2020-05-13 15:31:28 +02:00 |
|
Ivan Tashkinov
|
59b6d5f2aa
|
[#2456] Changed embed_relationships param to with_relationships.
|
2020-05-13 15:08:07 +03:00 |
|
lain
|
3cff4e24cd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-13 12:44:16 +02:00 |
|
Ivan Tashkinov
|
fd2fb2bb2e
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
|
2020-05-13 12:42:36 +03:00 |
|
lain
|
156c8a5088
|
Merge branch 'openapi/statuses' into 'develop'
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
|
2020-05-13 09:34:30 +00:00 |
|
Egor Kislitsyn
|
79ad12064d
|
Fix format
|
2020-05-13 01:59:17 +04:00 |
|
minibikini
|
cb1a3e196c
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:23:43 +00:00 |
|
minibikini
|
5a2333925c
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:23:36 +00:00 |
|
minibikini
|
822e9c09aa
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:23:21 +00:00 |
|
minibikini
|
40646a7e0e
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:14:52 +00:00 |
|
minibikini
|
0bb164a3e1
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:12:22 +00:00 |
|
minibikini
|
648cc0d72d
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:09:26 +00:00 |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
2020-05-13 00:25:21 +04:00 |
|
Ivan Tashkinov
|
bfb48e3db6
|
[#2456] OpenAPI: added embed_relationships param definition.
|
2020-05-12 20:55:01 +03:00 |
|
lain
|
b5aa204eb8
|
ChatController: Support deletion of chat messages.
|
2020-05-12 13:13:03 +02:00 |
|
Egor Kislitsyn
|
3bde0fa3f6
|
Add OpenAPI spec for TimelineController
|
2020-05-11 15:43:03 +04:00 |
|
lain
|
8d5597ff68
|
ChatController: Add GET /chats/:id
|
2020-05-10 13:26:14 +02:00 |
|
lain
|
172d9b1193
|
Chat: Add last_message to schema.
|
2020-05-10 13:08:01 +02:00 |
|
lain
|
1054e89762
|
ChatOperation: Add media id to example
|
2020-05-10 12:30:24 +02:00 |
|
lain
|
7637ef4203
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-08 13:13:37 +02:00 |
|
lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-07 15:05:40 +02:00 |
|
lain
|
3f867d8e9b
|
Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex
|
2020-05-07 10:48:09 +00:00 |
|
Egor Kislitsyn
|
dc4a448f48
|
Add OpenAPI spec for SearchController
|
2020-05-07 14:04:48 +04:00 |
|
Egor Kislitsyn
|
cdca62e8d4
|
Add schema for Tag
|
2020-05-07 14:04:07 +04:00 |
|
lain
|
4c92dfb73e
|
Merge branch 'openapi/polls' into 'develop'
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
|
2020-05-07 09:19:45 +00:00 |
|
lain
|
20baa2eaf0
|
ChatMessages: Add attachments.
|
2020-05-06 16:12:36 +02:00 |
|
Egor Kislitsyn
|
06c69c0a0a
|
Fix description
|
2020-05-06 14:18:19 +04:00 |
|
lain
|
205313e541
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-06 11:44:30 +02:00 |
|
lain
|
a716543267
|
Merge branch 'openapi/subscriptions' into 'develop'
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
|
2020-05-06 09:10:17 +00:00 |
|
lain
|
61ea8f1f5a
|
Merge branch 'openapi/markers' into 'develop'
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
|
2020-05-06 09:06:50 +00:00 |
|
lain
|
0a88bf6a9d
|
Merge branch 'openapi/follow_requests' into 'develop'
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
|
2020-05-06 09:00:39 +00:00 |
|
lain
|
957172a307
|
Merge branch 'openapi/filters' into 'develop'
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
|
2020-05-06 08:51:10 +00:00 |
|
lain
|
1ee34d4acb
|
Merge branch 'openapi/instance' into 'develop'
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
|
2020-05-06 08:46:14 +00:00 |
|
lain
|
7fdc7078ae
|
Merge branch 'openapi/lists' into 'develop'
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
|
2020-05-06 08:43:21 +00:00 |
|
lain
|
76c1a7a34b
|
Merge branch 'openapi/conversations' into 'develop'
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
|
2020-05-06 08:40:04 +00:00 |
|
Egor Kislitsyn
|
332e016bcd
|
Add OpenAPI spec for ScheduledActivityController
|
2020-05-05 23:42:24 +04:00 |
|
Egor Kislitsyn
|
6ba25d1197
|
Add Attachment schema
|
2020-05-05 23:42:24 +04:00 |
|
Egor Kislitsyn
|
0a1394cc1a
|
Add OpenAPI spec for PollController
|
2020-05-05 20:14:22 +04:00 |
|
Egor Kislitsyn
|
3a45952a3a
|
Add OpenAPI spec for ConversationController
|
2020-05-05 17:44:46 +04:00 |
|
Egor Kislitsyn
|
46aae346f8
|
Move single used schemas to Filter operation schema
|
2020-05-05 17:41:01 +04:00 |
|
Egor Kislitsyn
|
7e7a3e1544
|
Add OpenAPI spec for FilterController
|
2020-05-05 17:41:01 +04:00 |
|