aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2020-11-05Merge branch 'feature/expire-mutes' into 'develop'lain
Expiring mutes for users and activities Closes #1817 See merge request pleroma/pleroma!2971
2020-11-04Merge branch 'default-mrf' into 'develop'lain
Add TagPolicy as default MRF See merge request pleroma/pleroma!2834
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/expire-mutes
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-block-behavior
2020-10-30Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-29Improve Keyword descriptions for AdminFEMark Felder
2020-10-28Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
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 '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 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-block-behavior
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-20Merge remote-tracking branch 'origin/develop' into feature/account-exportEgor Kislitsyn
2020-10-20[#1668] Formatting fix.Ivan Tashkinov
2020-10-20Rename `Pleroma.Backup` to `Pleroma.User.Backup`Egor Kislitsyn
2020-10-20[#1668] Added :prometheus group config to config/description.exs.Ivan Tashkinov
2020-10-18[#1668] Restricted access to app metrics endpoint by default. Added ability ↵Ivan Tashkinov
to configure IP whitelist for this endpoint. Added tests and documentation.
2020-10-17Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11Ivan Tashkinov
2020-10-16Remove suggestionsMark Felder
2020-10-16The suggestions are problematic as they need to be real local account namesMark Felder
2020-10-16Adds feature to permit e.g., local admins and community moderators to ↵Mark Felder
automatically follow all newly registered accounts
2020-10-14Merge branch 'develop' into feature/account-exportMark Felder
2020-10-13Merge remote-tracking branch 'upstream/develop' into block-behaviorAlex Gleason
2020-10-13Merge branch 'develop' into feature/gen-magicMark Felder
2020-10-13Merge branch 'develop' into chore/elixir-1.11Mark Felder
2020-10-13RemoteIp module nameAlexander Strizhakov
2020-10-10Blocks: add blockers_visible configAlex Gleason
2020-10-09Merge branch 'develop' into feature/gen-magicMark Felder
2020-10-08Merge branch 'fix/2209-remoteip' into 'develop'Haelwenn
#2209 RemoteIP CIDR helper, config and doc improvements See merge request pleroma/pleroma!3057
2020-10-07instrumenters has no effect in Endpoint anymoreMark Felder
2020-10-07:pubsub is deprecated and replaced wit :pubsub_serverMark Felder
2020-10-07Add configurable temporary directoryEgor Kislitsyn
2020-10-07Add config for Pleroma.BackupEgor Kislitsyn
2020-10-07Add BackupWorkerEgor Kislitsyn
2020-10-06Improve description yet againMark Felder
2020-10-06Don't leak internal variables in the docs. They're useless to users.Mark Felder
2020-10-06Improve descriptions for reserved and proxiesMark Felder
2020-10-06Move hardcoded default configuration into config.exsMark Felder
2020-10-06Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For ↵Mark Felder
by default.
2020-10-06Merge branch 'feature/update-description-for-frontends-setting' into 'develop'rinpatch
Remove extra nesting and add labels in `:frontends` setting See merge request pleroma/pleroma!3043
2020-10-01web push http_client fixAlexander Strizhakov
2020-09-30Fix typoAngelina Filippova
2020-09-30Fix comma typoAngelina Filippova
2020-09-29Apply 1 suggestion(s) to 1 file(s)Angelina Filippova
2020-09-29Apply 1 suggestion(s) to 1 file(s)Angelina Filippova
2020-09-28Remove extra nesting and add labels in `:frontends` settingAngelina Filippova
2020-09-23Merge developRoman Chvanikov
2020-09-21Chase the Autolinker rename from !2677Mark Felder
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 15:34:37 +0000