Henry Jameson
278509c362
Merge remote-tracking branch 'origin/develop' into shigusegubu-new
2026-11-09 21:07:48 +02:00
HJ
7d6c533ac0
Merge pull request 'Added "last active at" field to OAuth tokens for easier management' ( #8061 ) from token-activity into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8061
2026-11-09 19:06:06 +00:00
Henry Jameson
f308f4dccf
oops
2026-11-09 20:44:56 +02:00
Henry Jameson
bbdbf58b66
i don't know what exactly i'm doing
2026-11-09 20:29:37 +02:00
Henry Jameson
b8669dd01f
fix
2026-11-09 20:13:39 +02:00
Henry Jameson
50593392d9
else
2026-11-09 19:55:49 +02:00
Henry Jameson
a8665e0ba1
lint
2026-11-09 19:35:18 +02:00
Henry Jameson
bc92e97175
oops
2026-11-09 19:25:05 +02:00
Henry Jameson
278f66a683
throttle
2026-11-09 19:15:02 +02:00
Henry Jameson
612be88ee1
Merge branch 'token-activity' into shigusegubu-new
2026-11-09 17:13:55 +02:00
Henry Jameson
4baafe313d
oc fixes
2026-11-09 16:51:09 +02:00
Henry Jameson
02d6262a08
oops
2026-11-09 16:29:34 +02:00
Henry Jameson
226135e2e1
i'm learning
2026-11-09 16:23:19 +02:00
Henry Jameson
74ab1769d1
lint?
2026-11-06 19:26:24 +02:00
Henry Jameson
ff89b67d55
lint
2026-11-06 19:16:15 +02:00
Henry Jameson
ae6e32c635
lint
2026-11-06 19:10:57 +02:00
Henry Jameson
a20b22f5a9
changelog
2026-11-06 19:01:09 +02:00
Henry Jameson
a06e471db7
Attempt at adding a last active field to tokens
2026-11-06 18:59:56 +02:00
HJ
ab8fae0b94
Merge pull request 'Mark currently accessing token in oauth token management API' ( #8059 ) from oauth-mark into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8059
2026-11-05 16:38:20 +00:00
Henry Jameson
ab9647458e
Merge remote-tracking branch 'origin/media-management' into shigusegubu-new
2026-11-05 18:03:27 +02:00
Henry Jameson
d9e75192ad
Merge remote-tracking branch 'origin/feature/bounded-retention' into shigusegubu-new
2026-11-05 18:01:42 +02:00
Henry Jameson
f55eb3a42c
Merge branch 'oauth-mark' into shigusegubu-new
2026-11-05 17:59:49 +02:00
Henry Jameson
b36f860a43
Merge remote-tracking branch 'origin/develop' into shigusegubu-new
2026-11-05 17:59:26 +02:00
Henry Jameson
b748e8aea0
fix
2026-11-05 17:31:33 +02:00
Henry Jameson
a614fcba79
oops?
2026-11-05 16:56:50 +02:00
Henry Jameson
22a2890f2b
manual lint
2026-11-05 16:31:58 +02:00
Henry Jameson
dfc21dc124
Revert "mix format"
...
This reverts commit 573134ac6c .
2026-11-05 16:31:02 +02:00
Henry Jameson
573134ac6c
mix format
2026-11-05 16:25:43 +02:00
Henry Jameson
bcc8b1e296
Mark currently accessing token in oauth token management API
2026-11-05 16:16:38 +02:00
Ekaterina Vaartis
2d3bebda5f
Add feature to tests
2026-11-04 20:58:44 +03:00
Ekaterina Vaartis
f8195b356d
Linting
2026-11-04 20:38:28 +03:00
Ekaterina Vaartis
51bdc0596c
Changelog for media management
2026-11-04 19:53:49 +03:00
Ekaterina Vaartis
6328e697b9
Add feature for user_media_management
2026-11-04 19:19:48 +03:00
Ekaterina Vaartis
0095a66198
Use limit and offset directly, otherwise the amount is wrong
...
It will return less than 50 for some reason
2026-11-04 19:19:32 +03:00
Ekaterina Vaartis
456dbf9997
Linting
2026-11-04 18:24:27 +03:00
Ekaterina Vaartis
0f21f6e802
Pagination and schema fixes for the media management endpoint
2026-11-04 18:18:08 +03:00
lain
b5726f6736
Merge pull request 'RichMedia: skip the quote fallback link when picking the card URL' ( #8004 ) from lambadalambda/pleroma:fix/card-skip-quote-link into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8004
2026-11-03 19:01:49 +00:00
Lain Soykaf
0667705b77
test: use sigils for HTML strings in quote link tests
2026-11-03 22:29:49 +04:00
lain
2c872cf474
Merge branch 'develop' into fix/card-skip-quote-link
2026-11-03 18:24:23 +00:00
Ekaterina Vaartis
70de22bf9b
Output attachment objects when listing uploaded media, error if used
...
Produce an error if the attachment is used in any posts
2026-11-03 20:28:25 +03:00
Ekaterina Vaartis
e0dce797ad
Work-in-progress media management
...
Adds a way to list media files uploaded by the user and delete
them. Ideally needs to at least check if the attachment is used
somewhere before actually deleting it, still.
2026-11-03 12:16:12 +03:00
lain
d2b89f5723
Merge pull request 'Federation: do not federate Undo Block when outgoing_blocks is off' ( #8044 ) from lambadalambda/pleroma:fix/undo-block-outgoing-blocks into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8044
2026-11-02 09:07:03 +00:00
lain
b1c51018a3
Merge pull request 'HTTP: back off from hosts that answer 429 or 503' ( #8049 ) from lambadalambda/pleroma:feat/http-backoff into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8049
2026-11-02 08:38:04 +00:00
Lain Soykaf
4070b7be21
fix(http): back off from the host that answered, and read Unix resets
...
After a redirect the 429/503 came from the final host, but the backoff
was recorded for the requested one. X-RateLimit-Reset is also accepted
as a Unix timestamp or as seconds.
2026-11-01 17:03:11 +04:00
lain
ec6c522ba6
Merge pull request 'Gun: connect to hosts that only have IPv6 addresses' ( #8052 ) from lambadalambda/pleroma:fix/gun-ipv6-only-hosts into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8052
2026-11-01 12:38:29 +00:00
lain
356daab6af
Merge pull request 'Federation: refetch a stale Move target once' ( #8051 ) from lambadalambda/pleroma:fix/move-refetch-target into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8051
2026-11-01 10:56:52 +00:00
lain
f71474b10b
Merge pull request 'Update ssl_verify_fun and phoenix_html for security advisories' ( #8055 ) from lambadalambda/pleroma:build/advisory-bumps into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8055
2026-11-01 09:58:19 +00:00
lain
23f9484a76
Merge pull request 'Akkoma fixes: context, polls, media proxy, ConfigDB, API params' ( #8047 ) from lambadalambda/pleroma:fix/akkoma-tier2 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8047
2026-11-01 09:11:11 +00:00
Lain Soykaf
9b7c59bc21
build: update ssl_verify_fun and phoenix_html for advisories
...
ssl_verify_fun 1.1.9 fixes partial-label wildcard matching
(EEF-CVE-2026-117666); Hackney uses its verify_fun for every HTTPS
request. phoenix_html 3.3.5 escapes attribute names
(EEF-CVE-2026-117645).
2026-11-01 11:10:49 +04:00
lain
d3495ceead
Merge pull request 'Rate limit C2S outbox posts and emoji reactions' ( #8042 ) from lambadalambda/pleroma:fix/c2s-rate-limit into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8042
2026-10-31 16:22:00 +00:00