summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-09Merge branch 'from/upstream-develop/tusooa/report-fake' into 'develop'Haelwenn
Report an Object, not a Create Activity Closes #2986 See merge request pleroma/pleroma!3788
2022-12-08Add tests for flagging non-Create activitiestusooa
2022-12-06Merge branch 'release-template' into 'develop'tusooa
Add Gitlab Releaseā„¢ into Release MR template See merge request pleroma/pleroma!3797
2022-12-06Merge branch 'jrabbit-develop-patch-67125' into 'develop'lain
Upgrade docs improvement: reccomend tagged releases over pulling stable branch See merge request pleroma/pleroma!3800
2022-12-06reccomend tagged releases over pulling stablejrabbit
2022-12-05Merge branch 'ci/amd64-build-tags' into 'develop'Haelwenn
CI: Tag amd64 releases for amd64 runners See merge request pleroma/pleroma!3799
2022-12-05Merge branch 'weblate' into 'develop'Haelwenn
Translations update from Pleroma Weblate See merge request pleroma/pleroma!3798
2022-12-06CI: Tag amd64 releases for amd64 runnersHaelwenn (lanodan) Monnier
2022-12-01Added translation using Weblate (Korean)Xnuk Shuman
2022-11-28Add Gitlab Releaseā„¢ into Release MR templateHaelwenn (lanodan) Monnier
2022-11-28Merge branch 'mergeback/2.4.5' into 'develop'Haelwenn
CHANGELOG.md: Fix date for 2.4.5 See merge request pleroma/pleroma!3795
2022-11-28Merge branch 'develop' into 'develop'Haelwenn
Change follow_operation schema to use type BooleanLike Closes #2999 See merge request pleroma/pleroma!3787
2022-11-28Change follow_operation schema to use type BooleanLikeave
2022-11-27CHANGELOG.md: Fix date for 2.4.5Haelwenn (lanodan) Monnier
2022-11-27Merge branch 'mergeback/2.4.5' into 'develop'Haelwenn
Mergeback: 2.4.5 See merge request pleroma/pleroma!3794
2022-11-27Mergeback of release 2.4.5Haelwenn (lanodan) Monnier
2022-11-27Merge branch 'skip-kanji-mac' into 'develop'Haelwenn
Skip two unicode/kanji tests that can't pass on Mac. See merge request pleroma/pleroma!3791
2022-11-27Skip two unicode/kanji tests that can't pass on Mac.Jeremy Huffman
2022-11-27scrubbers: Scrub img class attributeHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3790
2022-11-20Merge branch 'akoma/deactivated-users' into 'develop'Haelwenn
Timeline query performance improvements See merge request pleroma/pleroma!3779
2022-11-20Fix UtilsTesttusooa
2022-11-20Fix unit teststusooa
2022-11-20Fix report apitusooa
2022-11-19Flag an Object, not an Activitytusooa
2022-11-18Merge branch 'quack-docs' into 'develop'feld
Remove Quack from docs and cheatsheet See merge request pleroma/pleroma!3786
2022-11-18Remove Quack from docs and cheatsheetMark Felder
2022-11-17Merge branch 'flash-support-csp' into 'develop'feld
Reduce CSP policy to make Ruffle work on chrome See merge request pleroma/pleroma!3389
2022-11-17Document inclusion of wasm-unsafe-evalMark Felder
2022-11-17Update http_security_plug.exHJ
2022-11-17Update lib/pleroma/web/plugs/http_security_plug.exHJ
2022-11-17try to fix ruffle on chromeHenry Jameson
2022-11-14Merge branch 'develop' into 'akoma/deactivated-users'feld
# Conflicts: # CHANGELOG.md
2022-11-14Merge branch 'akkoma/delete-improvements' into 'develop'lain
Alter priority of Delete activities to be lowest See merge request pleroma/pleroma!3782
2022-11-14Merge branch 'bugfix/reset-unreachable-on-fetch' into 'develop'lain
Object.Fetcher: Set reachable on successful fetch See merge request pleroma/pleroma!3780
2022-11-13Alter priority of Delete activities to be lowestMark Felder
This will prevent a user with a large number of posts from negatively affecting performance of the outgoing federation queue if they delete their account.
2022-11-13Merge branch 'fix-typo-in-csp-report-to-header-name' into 'develop'Haelwenn
Fix typo in CSP Report-To header name See merge request pleroma/pleroma!3768
2022-11-13Merge branch 'weblate' into 'develop'Haelwenn
Translations update from Pleroma Weblate See merge request pleroma/pleroma!3772
2022-11-13Deletes do not generate notifications of any kind, so skip tryingMark Felder
2022-11-13Object.Fetcher: Set reachable on successful fetchHaelwenn (lanodan) Monnier
2022-11-12Document query performance improvementMark Felder
2022-11-12Add same optimized join for excluding invisible usersMark Felder
2022-11-12Fix reports which do not have a userMark Felder
The check for deactivated users was being applied to report activities.
2022-11-12Extract deactivated users query to a joinFloatingGhost
2022-11-12Translated using Weblate (Ukrainian)Dmytro Poltavchenko
Currently translated at 100.0% (95 of 95 strings) Translation: Pleroma/Pleroma Backend (domain errors) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/uk/
2022-11-12Added translation using Weblate (Ukrainian)Dmytro Poltavchenko
2022-11-12Added translation using Weblate (Ukrainian)Dmytro Poltavchenko
2022-11-12Merge branch 'oban-timeouts' into 'develop'feld
Define sane Oban Worker timeouts See merge request pleroma/pleroma!3777
2022-11-12Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'tusooa
Lint See merge request pleroma/pleroma!3778
2022-11-12Linttusooa
2022-11-12Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'tusooa
Give admin the choice to not strip reported statuses Closes #2887 See merge request pleroma/pleroma!3773