hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18,353 commits 2 branches 0 tags 251 MiB
Commit graph

102 commits

Author SHA1 Message Date
lain
745926189f Merge pull request 'OAuth: require security scopes for /api/oauth_tokens' (#8013) from lambadalambda/pleroma:fix/oauth-tokens-scopes into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8013
 2026-10-27 07:08:34 +00:00
Lain Soykaf
530ae4b339
 		feat(oauth): support the profile scope 
A token with only the profile scope can call verify_credentials, as in
Mastodon 4.3. The answer is the public account, so apps can use it to
log users in without seeing their email or settings.
 2026-10-26 12:29:51 +04:00
Lain Soykaf
c686b701dd
 		fix(oauth): require security scopes to list and revoke tokens 
/api/oauth_tokens skipped the scope check, so a token with any scope
could list the user's sessions and revoke them.
 2026-10-26 12:28:04 +04:00
lain
8ab0e046b1 Merge pull request 'Allow creating accounts without a password in the AdminAPI, update docs' (#7937) from mkljczk/pleroma:admin-api-passwordless-user-creation into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7937
 2026-07-27 07:17:14 +00:00
Lain Soykaf
836f4a2d69
 		fix(admin-api): reject explicit empty passwords 2026-07-24 22:52:23 +04:00
nicole mikołajczyk
36bc7b116d Allow creating accounts without a password in the AdminAPI, update docs 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-07-20 19:01:02 +02:00
Lain Soykaf
719b5d65b5
 		Require webhook events 2026-05-26 15:51:46 +04:00
lain
133fc64472 Merge branch 'develop' into webhooks 2026-05-06 07:53:46 +00:00
nicole mikołajczyk
40bc79e5ce Merge pull request 'Various bookmark folders-related improvements' (#7829) from mkljczk/pleroma:bookmark-folders into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7829
 2026-03-06 16:50:30 +00:00
nicole mikołajczyk
2086561fbd Various bookmark folders-related improvements 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-02 23:41:46 +01:00
nicole mikołajczyk
6405a2e682 Merge pull request 'Move avatar_description and header_description fields to the account object' (#7828) from mkljczk/pleroma:avatar-description-mastodon-api into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7828
 2026-03-01 22:40:01 +00:00
mkljczk
c392b21db1 Update docs on scrobbles 2026-02-27 09:22:14 +00:00
nicole mikołajczyk
3d9ac413af Move avatar_description and header_description fields to the account object 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-17 14:00:21 +01:00
nicole mikołajczyk
80ede85f75 Allow assigning users to reports 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 10:35:19 +01:00
nicole mikołajczyk
c6298be9f0 Merge branch 'scrobbles-scope' into 'develop' 
Add `write:scrobbles` and `read:scrobbles` scope for scrobbling

See merge request pleroma/pleroma!4379
 2025-12-16 20:53:32 +01:00
nicole mikołajczyk
d7b0115124 Merge branch 'mastodon-quotes-updates' into 'develop' 
Use Mastodon-compatible route for quotes list and param for quotes count

See merge request pleroma/pleroma!4367
 2025-12-02 14:34:16 +01:00
nicole mikołajczyk
f61fad0663 Pin/unpin chats 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-11-29 16:53:56 +01:00
nicole mikołajczyk
27223fc5bc Add write:scrobbles and read:scrobbles scope for scrobbling 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-10-15 10:59:53 +02:00
nicole mikołajczyk
c5b100a9f8 Merge branch 'develop' into 'mastodon-quotes-updates' 
# Conflicts:
#   docs/development/API/differences_in_mastoapi_responses.md
 2025-10-08 05:02:14 +02:00
nicole mikołajczyk
9eb923bd43 Merge branch 'docs' into 'develop' 
Update *Differences in Mastodon API responses from vanilla Mastodon*

See merge request pleroma/pleroma!4369
 2025-09-29 13:02:28 +02:00
nicole mikołajczyk
94188a293c Update *Differences in Mastodon API responses from vanilla Mastodon* 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2025-09-29 07:51:17 +02:00
nicole mikołajczyk
ef9bcb373a Use Mastodon-compatible route for quotes list and param for quotes count 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-09-27 11:44:45 +02:00
nicole mikołajczyk
9d7bdab7a2 Mastodon-compatible webhooks 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-09-19 17:07:23 +02:00
Lain Soykaf
f1cb334cd3 Document only_reblogs parameter in API differences 2025-07-23 14:00:57 +04:00
vaartis
cda7cbf2a1 Merge branch 'scrobbles' into 'develop' 
Change ScrobbleView external link param name to use snake case

See merge request pleroma/pleroma!4243
 2025-06-18 10:25:38 +00:00
Nicole Mikołajczyk
6b38ec310a Fix 'Create a user' description in admin api docs 
Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>
 2025-05-22 20:54:16 +02:00
Lain Soykaf
584e4efaaf mox_testing.md: Update with more information 2025-02-25 12:49:10 +04:00
Lain Soykaf
ccc6f2b288 Docs: Add mox testing info 2025-02-25 12:19:49 +04:00
marcin mikołajczak
c1a1150888 Merge branch 'profile-image-descriptions' into 'develop' 
Allow providing avatar/header descriptions

See merge request pleroma/pleroma!4227
 2024-09-14 17:46:33 +00:00
marcin mikołajczak
6d5ae4d2e9 Include list id in StatusView 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-03 15:17:45 +02:00
marcin mikołajczak
e35e84228d Change scrobble external link param name to use snake case 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-01 17:42:53 +02:00
marcin mikołajczak
3419e2cbdd Correct response in AdminAPI docs 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-28 18:28:22 +02:00
marcin mikołajczak
3498662712 Move new fields to pleroma object 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-17 19:59:39 +02:00
marcin mikołajczak
855c5a234f Update docs 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-17 17:06:39 +02:00
feld
f87aa8b83c Merge branch 'deprecate-subscribe' into 'develop' 
Mark `/api/v1/pleroma/accounts/:id/subscribe`/`unsubscribe` as deprecated

See merge request pleroma/pleroma!4216
 2024-08-12 21:27:12 +00:00
marcin mikołajczak
c1c0f0b144 Mark /api/v1/pleroma/accounts/:id/subscribe/unsubscribe as deprecated 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-12 12:38:51 +02:00
marcin mikołajczak
6e53e94bda Remove stub for /api/v1/accounts/:id/identity_proofs (deprecated by Mastodon 3.5.0) 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-12 12:23:38 +02:00
Mark Felder
f4693dc671 Update Prometheus/Grafana docs for PromEx 2024-05-27 12:18:51 -04:00
marcin mikołajczak
618b77071a Update pleroma_api.md 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-25 09:12:37 +02:00
marcin mikołajczak
ccc3ac241f Add hint to rules 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-06 11:45:19 +02:00
marcin mikołajczak
01a5f839c5 Merge remote-tracking branch 'origin/develop' into instance_rules 2024-04-06 10:42:23 +02:00
marcin mikołajczak
918c406a91 Merge remote-tracking branch 'origin/develop' into instance_rules 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-18 13:50:25 +01:00
lain
2b71f4897f Merge branch 'develop' into 'bookmark-folders' 
# Conflicts:
#   docs/development/API/differences_in_mastoapi_responses.md
 2024-03-18 10:35:02 +00:00
marcin mikołajczak
d415686bb9 Allow to group bookmarks in folders 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-01 11:04:01 +01:00
Haelwenn
ab3f03a04a Merge branch 'develop' into 'public-polls' 
# Conflicts:
#   docs/development/API/differences_in_mastoapi_responses.md
 2024-01-21 12:03:29 +00:00
marcin mikołajczak
fa02a1e634 Update MastoAPI responses docs 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-01-19 18:05:50 +01:00
marcin mikołajczak
90b442727e Update Admin API docs 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-01-19 17:53:37 +01:00
marcin mikołajczak
b39403a48f Update API docs for my changes 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-01-17 17:13:21 +01:00
marcin mikołajczak
017e35fbf1 Fix some more typos 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-12-28 00:17:04 +01:00
Mark Felder
bf57fd82bb Clarify location of test.secret.exs file 2023-12-20 14:12:06 -05:00