Henry Jameson
8d82808d7a
Merge remote-tracking branch 'origin/develop' into shigusegubu
2026-01-03 02:01:33 +02:00
lain
3d42219f12
Merge branch '2.10-mergeback' into 'develop'
...
Stable mergeback
See merge request pleroma/pleroma!4414
2025-12-31 14:56:45 +00:00
lain
3b99bbd955
Merge branch 'release/2.10' into 'stable'
...
Release/2.10
See merge request pleroma/pleroma!4413
2025-12-31 08:27:19 +00:00
Lain Soykaf
856bd7622e
GitlabCI: Fix.
2025-12-31 11:40:27 +04:00
Lain Soykaf
e1e16656ce
Merge in stable
2025-12-31 11:05:47 +04:00
Lain Soykaf
a5da6ce58e
Changelog: Update changelog
2025-12-31 10:49:28 +04:00
Lain Soykaf
92fc8f0012
Merge branch 'release/2.10' into release/2.10-sec
2025-12-29 17:08:46 +04:00
Lain Soykaf
b9e333c307
Frontend: Actually use the correct build.
2025-12-29 17:08:20 +04:00
Lain Soykaf
e204bc150e
Merge branch 'release/2.10' into release/2.10-sec
2025-12-29 09:49:53 +04:00
Lain Soykaf
c313c15d73
Mix: Fix version
2025-12-29 09:49:22 +04:00
Lain Soykaf
6c73ebe484
Merge branch 'phnt/mastoapi-misattribution-3381' into release/2.10-sec
2025-12-29 09:47:54 +04:00
Lain Soykaf
0127a10621
Changelog: Update changelog
2025-12-29 08:44:19 +04:00
Lain Soykaf
325c29c3fc
Static: Update bundled frontend to 2.10
2025-12-29 08:32:29 +04:00
Lain Soykaf
19add4036d
Mix: Bump version to 2.10
2025-12-29 08:23:14 +04:00
lain
d6888e24e4
Merge branch 'revert-cdd6df06' into 'develop'
...
Revert "Merge branch 'hackney-bump' into 'develop'"
See merge request pleroma/pleroma!4411
2025-12-26 05:08:43 +00:00
lain
23cb42a436
Revert "Merge branch 'hackney-bump' into 'develop'"
...
This reverts merge request !4409
2025-12-26 05:07:51 +00:00
Phantasm
38b3bff4e8
MastoAPI: Add more post attribution tests when fetched by Activity ID
...
Types returning 404:
- Accept
- Reject
- Delete
- Flag
- Follow
- Undo
Types returning posts:
- Create
- Update
- Like
- Announce
- EmojiReact
- Add/Remove
2025-12-25 20:40:21 +01:00
Phantasm
96de44b3d8
Tests AP Factory: fix featured collection factories
...
Internally it created Objects, tests passed Activities
2025-12-25 20:40:12 +01:00
lain
1a313fa30c
Merge branch 'replies_collection' into 'develop'
...
Provide full replies collection in ActivityPub objects (ported from akkoma)
See merge request pleroma/pleroma!4370
2025-12-25 10:22:53 +00:00
lain
cdd6df0621
Merge branch 'hackney-bump' into 'develop'
...
Update Hackney
See merge request pleroma/pleroma!4409
2025-12-25 09:25:23 +00:00
Lain Soykaf
916c8c0581
ActivityPubController: Don't crash on unknown params
2025-12-25 13:04:09 +04:00
Lain Soykaf
e07b3d2442
ObjectView: Make the first reply collection a page, so it shows the actual items.
2025-12-25 12:54:09 +04:00
Lain Soykaf
8e94c5ca38
UserView: Followers != Follows
2025-12-25 12:53:36 +04:00
Lain Soykaf
fc15c25889
Transmogrifier: Only set replies on objects, not activities.
2025-12-25 12:50:55 +04:00
Lain Soykaf
4c537534ad
NoteHandlingTest: Replies go on an object, not an activity.
2025-12-24 13:33:03 +04:00
Lain Soykaf
73b446bb07
ActivityPubControllerTest, UserViewTest: Add failing tests for reply collection related issues.
2025-12-24 12:20:11 +04:00
Mark Felder
3f9466e3a9
Update Hackney, the default HTTP client, to the latest release which supports Happy Eyeballs for improved IPv6 federation
2025-12-23 11:44:21 -08:00
Phantasm
07849927da
add changelogs
2025-12-23 18:38:34 +01:00
Phantasm
df375662d6
AP: simplify visible_for_user? conditions.
...
`true or true` returns `true`
2025-12-23 17:04:08 +01:00
Phantasm
7c93cd351b
MastoAPI StatusController: add tests for fetching context via Activity
2025-12-23 16:52:45 +01:00
Phantasm
ba8235ef50
lint
2025-12-23 16:51:59 +01:00
lain
2f48544937
Merge branch 'akkoma-fixes-1014-1018' into 'develop'
...
Status visibility checks for post interactions, stop leaking internal Activity representation (Akkoma PR 1014 and 1018)
Closes #3383
See merge request pleroma/pleroma!4400
2025-12-23 13:55:18 +00:00
Phantasm
b9601ae11a
MastoAPI: Add Announce and EmojiReact attribution tests
...
Introduces a new EmojiReact Activity factory
2025-12-23 00:17:16 +01:00
Phantasm
01ffaba3d2
MastoAPI: Fix unauth visibility checks when fetching by Activity FlakeID
...
- Adds another Pleroma.ActivityPub.Visibility.visible_for_user?/2 func
- Modifies existing tests to include a local Activity referencing a
remote Object
- Changes Announce Activity test factory to reference Objects instead of
Activities and use a different Actor for the Announce
- Changes ap_id of remote user in Announce test factory to match Objects
- Adds `object_local` option to Note factories that explicitly changes
the domain in the URL to not match the endpoint URL in the test env
to properly work with the new visibility func, since we don't store
locality of Object unlike Activities
2025-12-23 00:07:16 +01:00
Phantasm
c2b40659e7
MastoAPI: Fix misattribution when fetching status by Activity FlakeID
2025-12-22 23:33:00 +01:00
lain
bd41d15100
Merge branch 'nginx-config-update' into 'develop'
...
Update Nginx config example
See merge request pleroma/pleroma!4277
2025-12-22 12:23:42 +00:00
Lain Soykaf
2b8a366f9b
Nginx example: Add headers and use same paths we use in other places
2025-12-22 16:10:02 +04:00
Lain Soykaf
0f32134ea5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into nginx-config-update
2025-12-22 13:51:25 +04:00
lain
1d366c0138
Merge branch 'transmogrifier/handle-as-public' into 'develop'
...
Transmogrifier: convert "as:Public" to full w3 URL
See merge request pleroma/pleroma!4394
2025-12-22 07:39:44 +00:00
lain
d19b992417
Merge branch 'webfinger-actual-fix' into 'develop'
...
Fix WebFinger for split-domain setups
See merge request pleroma/pleroma!4405
2025-12-22 07:38:55 +00:00
Lain Soykaf
e9d9724637
WebFinger: Tighten the requirements.
2025-12-21 17:46:39 +04:00
Lain Soykaf
f70d1a436b
WebFingerTest: Add test for more webfinger spoofing.
2025-12-21 17:46:20 +04:00
lain
985a0a28c7
Merge branch 'docs-rum-idx' into 'develop'
...
Docs RUM: add OTP command, recommend vacuum after migration
See merge request pleroma/pleroma!4363
2025-12-21 11:36:39 +00:00
Lain Soykaf
ec58b6a4cc
CommonFixes, Transmogrifier: Fix tests.
2025-12-21 15:19:38 +04:00
Lain Soykaf
4496dc81c4
TransmogrifierTest, CreateGenericValidatorTest: Add regression tests for addressing.
2025-12-21 15:19:05 +04:00
lain
1d44640655
Merge branch 'relayd-ipv6' into 'develop'
...
OpenBSD relayd: Fix IPv6 example
See merge request pleroma/pleroma!4408
2025-12-21 10:24:38 +00:00
Lain Soykaf
98f300c5ae
Transmogrifier: Handle user updates.
2025-12-21 14:16:57 +04:00
Lain Soykaf
ed538603fb
TransmogrifierTest: Add failing test for Update.
2025-12-21 14:04:19 +04:00
nicole mikołajczyk
45611c9881
Merge branch 'mastodon-quote-id-api' into 'develop'
...
Support `quoted_status_id` parameter in post creation request
See merge request pleroma/pleroma!4392
2025-12-17 20:52:08 +01:00
Phantasm
ed7ad7d96a
OpenBSD relayd: Fix IPv6 example
...
relayd has problems loading certs when IPv4 and IPv6 listens are in the
same relay block.
2025-12-17 19:11:20 +01:00
