summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-11-13optimise notifications queryakkoma/notifications-fixFloatingGhost
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
2022-11-12Update config cheatsheettusooa
2022-11-12Clarify config descriptionHaelwenn
2022-11-12Document Oban workers getting timeouts definedMark Felder
2022-11-12Merge branch 'no-ducks' into 'develop'Haelwenn
Remove Quack logging backend See merge request pleroma/pleroma!3776
2022-11-11Linttusooa
2022-11-11Define sane Oban Worker timeoutsMark Felder
2022-11-11Clean up stale entries in mix.lockMark Felder
mix deps.clean --unlock --unused
2022-11-11Merge branch 'custom-db-port' into 'develop'feld
allow custom db port Closes #2981 See merge request pleroma/pleroma!3775
2022-11-11Document removal of QuackMark Felder
2022-11-11Add migration to remove Quack from ConfigDBMark Felder
2022-11-11Remove Quack logging backendMark Felder
2022-11-11fix envvarlain
2022-11-11allow custom db portIván Raskovsky
2022-11-11Merge branch 'soapbox-ref' into 'develop'lain
Update links to Soapbox See merge request pleroma/pleroma!3774
2022-11-11Update links to Soapboxmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-09Render a generated reported activity properlytusooa
2022-11-09Do not strip reported statuses when configured not totusooa
2022-11-07Merge branch 'docs/object_age-strip_followers' into 'develop'tusooa
ObjectAgePolicy: Make strip_followers behavior for followers-only explicit See merge request pleroma/pleroma!3770
2022-11-07ObjectAgePolicy: Make strip_followers behavior for followers-only explicitHaelwenn (lanodan) Monnier
2022-11-06Merge branch 'ci-coverage' into 'develop'tusooa
Test coverage: Switch to covertool to get cobertura output See merge request pleroma/pleroma!3745
2022-11-03Merge branch 'tusooa/caveats-webfinger' into 'develop'feld
Document some caveats of webfinger domain setting See merge request pleroma/pleroma!3767
2022-11-03Document some caveats of webfinger domain settingtusooa
2022-11-03Merge branch 'feature/1469-webfinger-expanding' into 'develop'Haelwenn
Feature/1469 webfinger expanding Closes #1469 and #2517 See merge request pleroma/pleroma!3361
2022-11-03rebase fixAlexander Strizhakov
2022-11-03docs updateAlexander Strizhakov
2022-11-03XML WebFinger user representation correct domainAlexander Strizhakov
2022-11-03docs & changelogAlexander Strizhakov
2022-11-03expanding WebFingerAlexander Strizhakov
2022-10-30Merge branch 'from/upstream-develop/tusooa/2930-get-or-fetch' into 'develop'Haelwenn
Fix User.get_or_fetch/1 with usernames starting with http Closes #2930 See merge request pleroma/pleroma!3751
2022-10-27Merge branch 'push-updates' into 'develop'tusooa
Push.Impl: support edits See merge request pleroma/pleroma!3760
2022-10-24Merge branch 'fix-deprecation-text' into 'develop'feld
Fix deprecation warning for Gun timeout See merge request pleroma/pleroma!3759
2022-10-15Merge branch 'security/PleromaAPI-delete' into 'develop'Haelwenn
CommonAPI: generate ModerationLog for all admin/moderator deletes See merge request pleroma/pleroma!3765
2022-10-14CommonAPI: generate ModerationLog for all admin/moderator deletesHaelwenn (lanodan) Monnier
As a side-effect it also changes the ChatMessage delete ID to an Activity.id rather than MessageReference.id Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2958
2022-10-11Merge branch 'weblate-extract' into 'develop'tusooa
Extract translatable strings See merge request pleroma/pleroma!3752
2022-10-11Extract translatable stringsweblate-extractor
2022-10-09Merge branch 'mergeback/2.4.4' into 'develop'tusooa
mergeback: 2.4.4 See merge request pleroma/pleroma!3762
2022-10-08Merge branch 'release/2.4.4' into mergeback/2.4.4Tusooa Zhu
2022-10-01Push.Impl: support editsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-30Fix deprecation warning for Gun timeoutfix-deprecation-textMark Felder
2022-09-27Merge branch 'fix/exclude-deactivated-in-search' into 'develop'Haelwenn
User: search: exclude inactive users from user search See merge request pleroma/pleroma!3755
2022-09-27Merge branch 'from/upstream-develop/tusooa/fix-static-tests' into 'develop'Haelwenn
Make instance document controller test sync Closes #2940 See merge request pleroma/pleroma!3757
2022-09-27Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop'Haelwenn
Reduce incoming and outgoing federation queue sizes to 5 Closes #2169 See merge request pleroma/pleroma!3756
2022-09-27Merge branch 'bugfix/elixir-1.14' into 'develop'Haelwenn
Bugfix: Elixir 1.14 See merge request pleroma/pleroma!3740
2022-09-20Make instance document controller test syncTusooa Zhu
2022-09-18Merge branch 'websocketex' into 'develop'tusooa
Use Websockex to replace websocket_client See merge request pleroma/pleroma!3743