lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
4 years ago |
|
lain
|
1748e26948
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Mark Felder
|
d7537a37c7
|
Add :chat to cheatsheet
|
4 years ago |
|
lain
|
205313e541
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
42a2acac46
|
Merge branch 'feature/1720-status-view' into 'develop'
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
|
4 years ago |
|
Alexander Strizhakov
|
e7d8ab8303
|
admin_api fetch status by id
|
4 years ago |
|
Egor Kislitsyn
|
cc922e7d8c
|
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate
|
4 years ago |
|
lain
|
7ff2a7dae2
|
Docs: Add Chat mark_as_read docs
|
4 years ago |
|
lain
|
c40afe5ba0
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
095635453a
|
Replace deprecated Roma by Fedi.
|
4 years ago |
|
rinpatch
|
3126f8a334
|
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
|
4 years ago |
|
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
|
4 years ago |
|
Alexander Strizhakov
|
631e8c1feb
|
docs update
|
4 years ago |
|
Alexander Strizhakov
|
1fd40532ae
|
docs fix
|
4 years ago |
|
Alexander Strizhakov
|
1c1b7e22af
|
list of options for pack metadata
|
4 years ago |
|
Alexander Strizhakov
|
ddb757f743
|
emoji api packs changes in routes with docs update
|
4 years ago |
|
Alexander Strizhakov
|
95759310ab
|
docs update
|
4 years ago |
|
Alexander Strizhakov
|
5839e67eb8
|
return data only for updated emoji
|
4 years ago |
|
lain
|
528ea779a6
|
Apply suggestion to docs/API/chats.md
|
4 years ago |
|
Egor Kislitsyn
|
8148d76ec5
|
Document `captcha_answer_data` parameter
|
4 years ago |
|
lain
|
0c491b904d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
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
|
4 years ago |
|
lain
|
30ea6bb167
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Mark Felder
|
4b3298133b
|
Document DELETE /api/v1/notifications/destroy_multiple
|
4 years ago |
|
lain
|
b5dc59c8fa
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
b550ef5611
|
Docs: Align chat api changes with docs.
|
4 years ago |
|
lain
|
4cadaf7e96
|
Docs: Add `/api/v1/instance` information
|
4 years ago |
|
lain
|
e62f8542a1
|
Docs: Add chat motivation and api description.
|
4 years ago |
|
Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
4 years ago |
|
lain
|
c86143ed73
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Alex Gleason
|
1bd9749a8f
|
Let blob: pass CSP
|
4 years ago |
|
lain
|
8480f84615
|
Update differences_in_mastoapi_responses.md
|
4 years ago |
|
Alexander
|
be34672d67
|
formatting
|
4 years ago |
|
Alexander
|
6e625a427c
|
reply filtering
|
4 years ago |
|
lain
|
a51cdafc01
|
Docs: Add documentation about chatmessages
|
4 years ago |
|
Egor Kislitsyn
|
1b06a27746
|
Update Flake ID description
|
4 years ago |
|
Ivan Tashkinov
|
0062116e07
|
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
|
4 years ago |
|
Ivan Tashkinov
|
2958a7d246
|
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
|
4 years ago |
|
lain
|
c466e739b6
|
Merge branch 'docs/debian-packages' into 'develop'
debian_based_*.md: Use erlang-nox metapackage
See merge request pleroma/pleroma!2268
|
4 years ago |
|
lain
|
568f48435e
|
Apply suggestion to docs/installation/debian_based_en.md
|
4 years ago |
|
Ivan Tashkinov
|
f685cbd309
|
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
|
4 years ago |
|
Alex Gleason
|
bedc558809
|
Merge remote-tracking branch 'upstream/develop' into accept-deletes
|
4 years ago |
|
Alex Gleason
|
b54c8813d6
|
Add :reject_deletes option to SimplePolicy
|
4 years ago |
|
lain
|
617a9f6208
|
Merge branch 'mrf-docs-update' into 'develop'
Expand MRF SimplePolicy docs
See merge request pleroma/pleroma!2370
|
4 years ago |
|
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
|
4 years ago |
|
Alexander Strizhakov
|
72ef6cc4f2
|
added need_reboot endpoint to admin api
|
4 years ago |
|
Ilja
|
aa0a4a1e78
|
small fix in the rewrite_policy example
|
4 years ago |
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
5 years ago |
|
Maksim Pechnikov
|
a16b3dbcbf
|
Merge branch 'develop' into issue/1276
|
5 years ago |
