summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-18Fix CommonAPI delete function to use User.privileged? instead of User.superuser?Sean King
2022-12-18Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Sean King
fine_grained_moderation_privileges
2022-12-16Merge branch 'fix-amd64-musl' into 'develop'lain
CI: Fix image for amd64-musl See merge request pleroma/pleroma!3810
2022-12-16CI: Fix image for amd64-muslLain Soykaf
2022-12-16Merge branch 'weblate-extract' into 'develop'tusooa
Extract translatable strings See merge request pleroma/pleroma!3764
2022-12-16Extract translatable stringsweblate-extractor
2022-12-16Merge branch 'fix-2856' into 'develop'tusooa
Uploading an avatar media exceeding max size returns a 413 Closes #2856 See merge request pleroma/pleroma!3804
2022-12-16Merge branch 'update-deps' into 'develop'lain
Update to Phoenix 1.6, Elixir 1.11, and chase dependencies See merge request pleroma/pleroma!3766
2022-12-15Merge branch 'from/upstream-develop/tusooa/register-approval' into 'develop'lain
Fix failure when registering a user with no email when approval required Closes #3021 See merge request pleroma/pleroma!3807
2022-12-15AudioVideoValidator: Fix embedded attachment requirementsLain Soykaf
2022-12-15StatusView: Fix warningLain Soykaf
2022-12-15AttachmentValidator: Actually require urlLain Soykaf
2022-12-15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-depsLain Soykaf
2022-12-14Fix failure when registering a user with no email when approval requiredtusooa
2022-12-11Return 413 when an actor's banner or background exceeds the size limitduponin
2022-12-11Uploading an avatar media exceeding max size returns a 413duponin
Until now it was returning a 500 because the upload plug were going through the changeset and ending in the JSON encoder, which raised because struct has to @derive the encoder.
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