summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-26Merge branch 'docs/clients-apc2s' into 'develop'lain
clients.md: Add AndStatus, note supported protocols See merge request pleroma/pleroma!3104
2020-10-26Merge branch 'patch-1' into 'develop'rinpatch
Fix link reference See merge request pleroma/pleroma!3103
2020-10-26clients.md: Add AndStatus, note supported protocolsHaelwenn (lanodan) Monnier
2020-10-26Merge branch 'docs/ap_c2s' into 'develop'Haelwenn
AP C2S: Document our additional endpoints See merge request pleroma/pleroma!3056
2020-10-25Fix link referenceKana
2020-10-23Merge branch 'fix/sendmail' into 'develop'Haelwenn
Fix ability to use sendmail on Linux distros with systemd See merge request pleroma/pleroma!3102
2020-10-23NoNewPrivileges breaks ability to send email via sendmail because it ↵Mark Felder
restricts ability to run setuid/setgid binaries
2020-10-23Merge branch '2242-nsfw-case' into 'develop'rinpatch
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094
2020-10-22Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
Translations update from Weblate See merge request pleroma/pleroma!3100
2020-10-22Translated using Weblate (Chinese (Simplified))shironeko
Currently translated at 45.2% (48 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
2020-10-22Merge branch 'chore/elixir-1.11' into 'develop'feld
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059
2020-10-22[#3059] Used forked prometheus-phx to remove log spam.Ivan Tashkinov
2020-10-22[#3059] Formatting fix.Ivan Tashkinov
2020-10-22Merge branch '2257-self-chat' into 'develop'rinpatch
Resolve "Can't message yourself in a chat (but can start it)" Closes #2257 See merge request pleroma/pleroma!3099
2020-10-22[#3059] Fixed Phoenix 1.5 telemetry processing.Ivan Tashkinov
2020-10-22Changelog: Add information about self-chatslain
2020-10-22SideEffects: Correctly handle chat messages sent to yourselflain
2020-10-20Merge branch 'bugfix/ci-majic-release' into 'develop'Haelwenn
CI: Install libmagic-dev in debian release targets See merge request pleroma/pleroma!3096
2020-10-20CI: Install libmagic-dev in debian release targetsHaelwenn (lanodan) Monnier
2020-10-20Fix credo warningsEgor Kislitsyn
2020-10-20Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-20Rename `Pleroma.Backup` to `Pleroma.User.Backup`Egor Kislitsyn
2020-10-20Merge branch 'bugfix/ci-majic-release' into 'develop'Haelwenn
CI: Install file-dev in alpine release targets See merge request pleroma/pleroma!3095
2020-10-20CI: Install file-dev in alpine release targetsHaelwenn (lanodan) Monnier
2020-10-19Merge branch 'fix/autofollower-suggestions' into 'develop'Haelwenn
Remove suggestions for autofollower_nicknames See merge request pleroma/pleroma!3088
2020-10-19Fix credo warningsEgor Kislitsyn
2020-10-19Transmogrifier: Refactor and unify incoming tag handlinglain
2020-10-19Transmogrifier: Downcase incoming Hashtagslain
Also, set sensitive to true if we have an nsfw hashtag present.
2020-10-19Fix testsEgor Kislitsyn
2020-10-19Merge branch '2239-mute-fixes' into 'develop'Haelwenn
ActivityPub: Show own replies to muted users. Closes #2239 See merge request pleroma/pleroma!3084
2020-10-17Merge branch 'chore/changelogfix' into 'develop'feld
Fix duplicate Added sections in the changelog See merge request pleroma/pleroma!3091
2020-10-17Fix duplicate Added sections in the changelogMark Felder
2020-10-17Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11Ivan Tashkinov
2020-10-16The suggestions are problematic as they need to be real local account namesMark Felder
2020-10-15Merge branch 'refactor/discoverable_user_field' into 'develop'feld
Change user.discoverable field to user.is_discoverable See merge request pleroma/pleroma!3078
2020-10-15Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder
2020-10-15Apply 1 suggestion(s) to 1 file(s)Haelwenn
2020-10-15Merge branch 'issue/2009' into 'develop'feld
[#2009] fixed install docs (release env) See merge request pleroma/pleroma!2854
2020-10-15fix testMaksim Pechnikov
2020-10-15added generate the release env to `pleroma.instance gen`Maksim Pechnikov
2020-10-15fixed install docsMaksim Pechnikov
2020-10-15fix docsMaksim Pechnikov
2020-10-15Apply 1 suggestion(s) to 1 file(s)Maksim
2020-10-15Apply 1 suggestion(s) to 1 file(s)Maksim
2020-10-15update task messagesMaksim Pechnikov
2020-10-15added generated `pleroma.env`Maksim Pechnikov
2020-10-15Update dependenciesEgor Kislitsyn
2020-10-15Fix warningsEgor Kislitsyn
2020-10-15ActivityPub: Show own replies to muted users.lain
Aligns mute with block behavior.