summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2025-02-25AnonymizeFilename: AsyncifyLain Soykaf
2025-02-25Merge branch and resolve conflict in database_test.exsLain Soykaf
2025-02-25DatabaseTest: Include user_follows_hashtag in expected tablesLain Soykaf
2025-02-24AppTest: Make test more resilient.Lain Soykaf
2025-02-24PackTest: Make test more resilientLain Soykaf
2025-02-23DataCase: By default, stub DateTime.Lain Soykaf
2025-02-23Tests: Use StaticConfig when possible.Lain Soykaf
2025-02-23UserRelationshipTest: Don't use Mock.Lain Soykaf
2025-02-22Merge branch 'post-languages' into 'develop'lain
Allow to specify post language See merge request pleroma/pleroma!3940
2025-02-22Merge branch 'follow-hashtags' into 'develop'lain
Hashtag following (from Akkoma) See merge request pleroma/pleroma!4307
2025-02-22Merge branch 'docs-fix' into 'develop'lain
Cheatsheet: Use the correct section See merge request pleroma/pleroma!4325
2025-02-22Cheatsheet: Use the correct sectionLain Soykaf
2025-02-22Merge branch 'feld/emailed-patch' into 'develop'feld
Fix missing check for domain presence in rich media ignore_host configuration See merge request pleroma/pleroma!4324
2025-02-21Fix missing check for domain presence in rich media ignore_host configurationMark Felder
2025-02-17Merge branch 'fix-incoming-scrobbles' into 'develop'mkljczk
Allow incoming "Listen" activities See merge request pleroma/pleroma!4323
2025-02-17Allow incoming "Listen" activitiesmkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-17update testmkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-17credomkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-17Include contentMap in outgoing postsmkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-17Merge remote-tracking branch 'origin/develop' into post-languagesmkljczk
2025-01-30Merge branch '3355-vips-blurhash' into 'develop'lain
AnalyzeMetadata: Don't crash on grayscale image blurhash Closes #3355 See merge request pleroma/pleroma!4319
2025-01-30Add changelogLain Soykaf
2025-01-30AnalyzeMetadata: Don't crash on grayscale image blurhashLain Soykaf
2025-01-28Merge branch 'fix-mastodon-edits' into 'develop'mkljczk
Fix Mastodon incoming edits with inlined "likes" See merge request pleroma/pleroma!4318
2025-01-28Fix Mastodon incoming edits with inlined "likes"mkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-01-21Merge branch 'description' into 'develop'lain
description.exs: Remove suggestion referencing a deleted module See merge request pleroma/pleroma!4316
2025-01-21description.exs: Remove suggestion referencing a deleted modulemkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-01-21Merge branch 'actor-published' into 'develop'mkljczk
Include "published" in actor view See merge request pleroma/pleroma!4312
2025-01-21Merge branch 'proxy-redirect' into 'develop'Haelwenn
MediaProxyController: Use 301 for permanent redirects See merge request pleroma/pleroma!4313
2025-01-21MediaProxyController: Use 301 for permanent redirectsLain Soykaf
2025-01-19Include "published" in actor viewmkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-01-18Merge branch 'backup-links' into 'develop'mkljczk
Link to exported outbox/followers/following collections in backup actor.json See merge request pleroma/pleroma!4311
2025-01-09Link to exported outbox/followers/following collections in backup actor.jsonmkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30fix testsmkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30fix alias orderingmkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30update specmkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30Update changelogmkljczk
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30Add /api/v1/followed_tagsFloatingGhost
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30Remerge of hashtag following (#341)floatingghost
this time with less idiot Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/341 Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-21Merge branch 'mergeback/2.8.0-image-fixes' into 'develop'lain
Mergeback/2.8.0 image fixes See merge request pleroma/pleroma!4306
2024-12-21Merge branch 'maint/hexpm-images' into 'stable'lain
Switching release building to mostly use hex.pm images See merge request pleroma/pleroma!4305
2024-12-20Add changelogLain Soykaf
2024-12-20Switch release builder to hexpm images (mostly)Lain Soykaf
2024-12-20Merge branch '2.8.0-release-fix' into 'stable'lain
CI: Allow failure for non-musl arm for now See merge request pleroma/pleroma!4304
2024-12-20CI: Allow failure for non-musl arm for nowLain Soykaf
2024-12-19Merge branch 'mergeback/2.8.0' into 'develop'lain
Mergeback/2.8.0 See merge request pleroma/pleroma!4302
2024-12-19Merge branch 'release/2.8.0' into 'stable'lain
Release/2.8.0 See merge request pleroma/pleroma!4295
2024-12-09Update changelogLain Soykaf
2024-12-09Verify a local Update sent through AP C2S so users can only update their own ↵tusooa
objects
2024-11-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into release/2.8.0Lain Soykaf