aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-29Merge branch 'mutes-blocks-pagination' into 'develop'feld
Support pagination of blocks and mutes Closes #642 See merge request pleroma/pleroma!3080
2020-10-29Merge branch 'fix/mrf-keyword-description' into 'develop'feld
Improve Keyword descriptions for AdminFE See merge request pleroma/pleroma!3110
2020-10-29Improve Keyword descriptions for AdminFEMark Felder
2020-10-29Merge remote-tracking branch 'origin/develop' into mutes-blocks-paginationEgor Kislitsyn
2020-10-29Merge branch 'bugfix/admin-api-account-view-is-discoverable-fix' into 'develop'feld
Fix: User.is_discoverable attribute rendering in Admin API User view See merge request pleroma/pleroma!3107
2020-10-28Fixed User.is_discoverable attribute rendering in Admin API User view.Ivan Tashkinov
2020-10-28Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' ↵feld
into 'develop' OStatus / Static FE access control fixes See merge request pleroma/pleroma!3053
2020-10-28@doc fix.Ivan Tashkinov
2020-10-28Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
ostatus-controller-no-auth-check-on-non-federating-instances # Conflicts: # CHANGELOG.md
2020-10-28Merge branch 'issue/2261' into 'develop'feld
[#2261] FrontStatic plug: excluded invalid url See merge request pleroma/pleroma!3106
2020-10-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261Mark Felder
2020-10-28Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-28Fix warningEgor Kislitsyn
2020-10-27Merge branch 'feature/autofollowing' into 'develop'feld
autofollowing_nicknames See merge request pleroma/pleroma!3087
2020-10-27Merge branch '2236-no-name' into 'develop'Haelwenn
Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101
2020-10-27Merge branch 'develop' into 'feature/autofollowing'feld
# Conflicts: # CHANGELOG.md
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-27Merge branch 'fix/prometheus-test' into 'develop'feld
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+ See merge request pleroma/pleroma!3105
2020-10-27FrontStatic plug: excluded invalid urlMaksim Pechnikov
2020-10-27phoenix_controller_render_duration is no longer available in telemetry of ↵Mark Felder
Phoenix 1.5+
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-27Merge branch 'develop' into feature/account-exportMark Felder
2020-10-27Merge branch '1668-prometheus-access-restrictions' into 'develop'feld
[#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093
2020-10-27Merge branch 'develop' into 'feature/autofollowing'feld
# Conflicts: # CHANGELOG.md
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-26ActivityPub: Add back debug call + explanation.lain
2020-10-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-namelain
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-23Changelog: Add info about whitespace name remote users.lain
2020-10-23User: Correctly handle whitespace names.lain
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-22fix module nameMaksim Pechnikov
2020-10-22update changelogMaksim Pechnikov
2020-10-22update docsMaksim Pechnikov
2020-10-22admin api: added user filters by `actor_types`Maksim Pechnikov
2020-10-22admin user search: added filter by `actor_type`Maksim Pechnikov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 06:35:36 +0000