Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop 2025-03-07 #277

Merged
merged 76 commits into from
Mar 6, 2025
Merged

Merge develop 2025-03-07 #277

merged 76 commits into from
Mar 6, 2025

Conversation

kphrx
Copy link
Owner

@kphrx kphrx commented Mar 6, 2025

No description provided.

mkljczk and others added 30 commits August 11, 2023 00:07
Signed-off-by: marcin mikołajczak <[email protected]>
Signed-off-by: marcin mikołajczak <[email protected]>
Signed-off-by: marcin mikołajczak <[email protected]>
Signed-off-by: marcin mikołajczak <[email protected]>
Signed-off-by: marcin mikołajczak <[email protected]>
Signed-off-by: marcin mikołajczak <[email protected]>
…a's branch for MapOfString

Signed-off-by: marcin mikołajczak <[email protected]>
Signed-off-by: marcin mikołajczak <[email protected]>
Signed-off-by: marcin mikołajczak <[email protected]>
Signed-off-by: marcin mikołajczak <[email protected]>
# Conflicts:
#   lib/pleroma/web/activity_pub/transmogrifier.ex
#   test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
Signed-off-by: marcin mikołajczak <[email protected]>
Signed-off-by: marcin mikołajczak <[email protected]>
this time with less idiot

Co-authored-by: FloatingGhost <[email protected]>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/341
Signed-off-by: mkljczk <[email protected]>
Signed-off-by: mkljczk <[email protected]>
lambadalambda and others added 28 commits February 28, 2025 12:53
Fix OpenGraph/TwitterCard meta tag ordering for posts with multiple attachments

See merge request pleroma/pleroma!4328
The logic has been changed to ensure we always choose the first image if multiple are specified. This also applies when both OpenGraph and TwitterCard tags are published on a page. We parse for OpenGraph tags first and in this case the website was intentionally serving different images for TwitterCards and OpenGraph.
DNSRBL was a neat experiment which should live out of tree. It works and could be used to coordinate rules across different servers, but Simple Policy will always be better

FODirectReply and QuietReply have reliability issues as implemented in an MRF. If we want to expose this functionality to admins it should be a setting that overrides the chosen scope during CommonAPI.post instead of trying to rewrite the recipients with an MRF.
Retire MRFs DNSRBL, FODirectReply, and QuietReply

See merge request pleroma/pleroma!4330
Rich Media Parser should use first image found

Closes #3356

See merge request pleroma/pleroma!4329
The newest git HEAD of MIME already knows about APNG, but this
hasn’t been released yet. Without this, APNG attachments from
remote posts won’t display as images in frontends.

Fixes: akkoma#657
Release/2.9.0

See merge request pleroma/pleroma!4331
2.9.0 mergeback

See merge request pleroma/pleroma!4332
remove changelog entries from changelog.d

See merge request pleroma/pleroma!4335
Include my frontend in available frontends

See merge request pleroma/pleroma!4334
Safezip: Fix test (issue was a difference in file ordering between otp26 and otp27)

See merge request pleroma/pleroma!4336
@kphrx kphrx enabled auto-merge March 6, 2025 19:54
@kphrx kphrx merged commit 4021864 into pl.kpherox.dev Mar 6, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants