summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2023-02-09Merge branch 'fix-relme' into 'develop'lain
2023-02-09Merge branch 'tusooa/notif-setting' into 'develop'lain
2023-02-09Merge branch 'test-warnings' into 'develop'lain
2023-02-09B TestHelper, CI: Work with older elixir version.Lain Soykaf
2023-02-09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into test-warningsLain Soykaf
2023-01-18Fix block_from_stranger settingtusooa
2023-01-05Merge branch '2768-strip-location' into 'develop'lain
2023-01-05B StripLocation: Add test, work for all svgs.Lain Soykaf
2023-01-05Added SVG to formats not compatible with exiftoolDmytro Poltavchenko
2023-01-03Merge branch 'tusooa/earmark' into 'develop'lain
2023-01-03B TestHelper: Remove warnings-as-errorsLain Soykaf
2023-01-03Tests: Capture logs to clean up the test output.Lain Soykaf
2023-01-03Fix warnings in tests, treat warnings as errors in CI.Lain Soykaf
2023-01-02Merge branch 'revert-0fe3f749' into 'develop'lain
2023-01-02Revert "Merge branch 'copyright-bump' into 'develop'"lain
2023-01-02Merge branch 'copyright-bump' into 'develop'Haelwenn
2023-01-01Bump copyright yearmarcin mikołajczak
2022-12-30Remove unwanted code specific to MIX_ENV=testMark Felder
2022-12-29Fix rel="me"Mark Felder
2022-12-28Bump earmark to 1.4.22tusooa
2022-12-24Merge branch 'weblate-extract' into 'develop'Haelwenn
2022-12-24Extract translatable stringsweblate-extractor
2022-12-23Merge branch 'mergeback/2.5.0' into 'develop'Haelwenn
2022-12-23mix: version 2.5.50Haelwenn (lanodan) Monnier
2022-12-23Merge branch 'release/2.5.0' into 'stable'Haelwenn
2022-12-23mix: Release 2.5.0Haelwenn (lanodan) Monnier
2022-12-23CHANGELOG: Set 2.5.0Haelwenn (lanodan) Monnier
2022-12-23Git merge is not my favorite toolHaelwenn (lanodan) Monnier
2022-12-23Revert "Delete report notifs when demoting from superuser"Haelwenn (lanodan) Monnier
2022-12-23Merge back 2.4.5Haelwenn (lanodan) Monnier
2022-12-23Merge branch 'pleromafe-2.5.0' into 'develop'Haelwenn
2022-12-23Update PleromaFE bundle to 2.5.0Haelwenn (lanodan) Monnier
2022-12-23Merge branch 'adminfe-2.5.0' into 'develop'Haelwenn
2022-12-23Merge branch 'fine_grained_moderation_privileges' into 'develop'Haelwenn
2022-12-21Make lint happySean King
2022-12-21Use crazy hack to finally get pleroma:report notifications not visible after ...Sean King
2022-12-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_graine...Sean King
2022-12-21Update AdminFE bundle to version 2.5.0Haelwenn (lanodan) Monnier
2022-12-20Merge branch 'weblate-extract' into 'develop'lain
2022-12-20Extract translatable stringsweblate-extractor
2022-12-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_graine...Sean King
2022-12-20Merge branch 'deletion-resilience' into 'develop'lain
2022-12-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_graine...Sean King
2022-12-20Merge branch 'doc_readme_nixos' into 'develop'lain
2022-12-20Merge branch 'from/upstream/develop/tusooa/mrf-updates' into 'develop'lain
2022-12-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_graine...Sean King
2022-12-20Merge branch 'fix/2980-rss-feed-generation' into 'develop'lain
2022-12-19Merge branch 'develop' into 'fix/2980-rss-feed-generation'lain
2022-12-19Merge branch 'fix-twittercard-tags' into 'develop'feld
2022-12-19Fix TwitterCard meta tagsMark Felder