Commit graph

869 commits

Author SHA1 Message Date
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
Stephanie Wilde-Hobbs
80308c5c26
Add config migration disclaimer to config whitelist documentation 2020-05-14 15:56:14 +01:00
Stephanie Wilde-Hobbs
20cbfb5cb5
Allow whitelisting whole groups 2020-05-14 12:43:53 +01:00
lain
0f0acc740d Chat: Allow posting without content if an attachment is present. 2020-05-13 15:31:28 +02:00
Stephanie Wilde-Hobbs
620247a015
Add database configuration whitelist 2020-05-12 17:12:27 +01: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
lain
1748e26948 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-06 17:36:08 +02:00
Mark Felder
d7537a37c7 Add :chat to cheatsheet 2020-05-06 08:55:09 -05: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
lain
42a2acac46 Merge branch 'feature/1720-status-view' into 'develop'
Admin API fetch status by id

Closes #1720

See merge request pleroma/pleroma!2475
2020-05-05 13:40:12 +00:00
Alexander Strizhakov
e7d8ab8303
admin_api fetch status by id 2020-05-05 16:18:56 +03:00
Egor Kislitsyn
cc922e7d8c
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate 2020-05-05 15:01:33 +04: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
lain
095635453a Replace deprecated Roma by Fedi. 2020-05-02 18:10:50 +00: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
0c491b904d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-29 13:19:04 +02:00
Ivan Tashkinov
908cf22a6c Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-28 19:56:20 +03: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
c86143ed73 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-27 12:07:08 +02:00
Alex Gleason
1bd9749a8f
Let blob: pass CSP 2020-04-26 00:29:42 -05:00
lain
8480f84615
Update differences_in_mastoapi_responses.md 2020-04-24 15:43:54 +03:00