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 |
|
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
|
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
|
5b8105928b
|
Docs: Add background_image in instance
|
2020-05-20 12:13:57 +02:00 |
|
Egor Kislitsyn
|
e4c720f14c
|
Fix typo
|
2020-05-19 14:59:50 +04:00 |
|
Egor Kislitsyn
|
d4a7577cde
|
Fix API documentation
|
2020-05-18 22:01:38 +04:00 |
|
lain
|
1d18721a3c
|
Chats: Add updated_at to Schema and docs.
|
2020-05-15 13:18:41 +02:00 |
|
lain
|
0f0acc740d
|
Chat: Allow posting without content if an attachment is present.
|
2020-05-13 15:31:28 +02:00 |
|
lain
|
a61120f497
|
Documention: Add chat message deletion docs
|
2020-05-12 13:25:25 +02:00 |
|
lain
|
8cc8d960af
|
Documentation: Add GET /chats/:id
|
2020-05-10 13:27:40 +02:00 |
|
lain
|
17be3ff669
|
Documentation: Add last_message to chat docs.
|
2020-05-10 13:01:20 +02:00 |
|
lain
|
e297d8c649
|
Documentation: Add attachment docs
|
2020-05-10 12:34:12 +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 |
|
Maksim Pechnikov
|
b078e0567d
|
Merge branch 'develop' into issue/1276-2
|
2020-05-08 08:51:09 +03:00 |
|
lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-07 15:05:40 +02:00 |
|
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
2020-05-07 08:14:54 +00:00 |
|
Maksim Pechnikov
|
bd261309cc
|
added unread_notifications_count for /api/v1/accounts/verify_credentials
|
2020-05-06 15:08:38 +03:00 |
|
lain
|
205313e541
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-06 11:44:30 +02:00 |
|
Maksim Pechnikov
|
fb38b7339c
|
Merge branch 'develop' into issue/1276-2
|
2020-05-06 05:55:39 +03:00 |
|
Alexander Strizhakov
|
e7d8ab8303
|
admin_api fetch status by id
|
2020-05-05 16:18:56 +03:00 |
|
lain
|
7ff2a7dae2
|
Docs: Add Chat mark_as_read docs
|
2020-05-04 13:12:21 +02:00 |
|
lain
|
c40afe5ba0
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-04 10:43:20 +02:00 |
|
Maksim Pechnikov
|
fe7a0d660e
|
Merge branch 'develop' into issue/1276-2
|
2020-05-04 06:08:49 +03:00 |
|
rinpatch
|
3126f8a334
|
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
|
2020-05-02 16:44:55 +00:00 |
|
lain
|
2008fa9c7f
|
Merge branch 'fix/captcha' into 'develop'
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
|
2020-05-01 11:47:58 +00:00 |
|
Maksim Pechnikov
|
a92c713d9c
|
Merge branch 'develop' into issue/1276-2
|
2020-05-01 06:21:59 +03:00 |
|
Alexander Strizhakov
|
631e8c1feb
|
docs update
|
2020-04-30 16:09:23 +03:00 |
|
Alexander Strizhakov
|
1fd40532ae
|
docs fix
|
2020-04-30 16:09:23 +03:00 |
|
Alexander Strizhakov
|
1c1b7e22af
|
list of options for pack metadata
|
2020-04-30 16:09:22 +03:00 |
|
Alexander Strizhakov
|
ddb757f743
|
emoji api packs changes in routes with docs update
|
2020-04-30 16:09:18 +03:00 |
|
Alexander Strizhakov
|
95759310ab
|
docs update
|
2020-04-30 15:45:56 +03:00 |
|
Alexander Strizhakov
|
5839e67eb8
|
return data only for updated emoji
|
2020-04-30 15:24:02 +03:00 |
|
lain
|
528ea779a6
|
Apply suggestion to docs/API/chats.md
|
2020-04-29 17:56:24 +00:00 |
|
Egor Kislitsyn
|
8148d76ec5
|
Document captcha_answer_data parameter
|
2020-04-29 21:26:07 +04:00 |
|
lain
|
30ea6bb167
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-28 17:48:05 +02:00 |
|
Mark Felder
|
4b3298133b
|
Document DELETE /api/v1/notifications/destroy_multiple
|
2020-04-28 10:13:58 -05:00 |
|
lain
|
b5dc59c8fa
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-28 14:16:21 +02:00 |
|
Maksim Pechnikov
|
270c3fe446
|
fix markdown format
|
2020-04-28 06:45:59 +03:00 |
|
lain
|
b550ef5611
|
Docs: Align chat api changes with docs.
|
2020-04-27 17:52:16 +02:00 |
|
lain
|
4cadaf7e96
|
Docs: Add /api/v1/instance information
|
2020-04-27 14:33:21 +02:00 |
|
lain
|
e62f8542a1
|
Docs: Add chat motivation and api description.
|
2020-04-27 13:48:09 +02:00 |
|
Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
2020-04-27 14:33:00 +04:00 |
|
lain
|
8480f84615
|
Update differences_in_mastoapi_responses.md
|
2020-04-24 15:43:54 +03:00 |
|
Alexander
|
be34672d67
|
formatting
|
2020-04-24 15:43:54 +03:00 |
|
Alexander
|
6e625a427c
|
reply filtering
|
2020-04-24 15:43:49 +03:00 |
|
Egor Kislitsyn
|
1b06a27746
|
Update Flake ID description
|
2020-04-22 20:20:19 +04:00 |
|
Haelwenn
|
a17bfb5fab
|
Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
|
2020-04-17 09:19:35 +00:00 |
|