aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2020-08-12Merge branch 'feature/update-welcome-setting-in-description' into 'develop'feld
Update :welcome settings in description.exs Closes #2024 See merge request pleroma/pleroma!2843
2020-08-09Merge branch 'develop' into 'feat/floki-fast-html-2'lain
# Conflicts: # config/config.exs
2020-08-07Merge branch 'develop' into fix/ldap-auth-issuesMark Felder
2020-08-07Merge branch 'feature/update-welcome-setting-in-description' of ↵Angelina Filippova
git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description
2020-08-07Add new `image` type to settings whose values are image urlsAngelina Filippova
2020-08-07Make Floki use fast_htmlrinpatch
2020-08-07Merge branch 'develop' into feature/update-welcome-setting-in-descriptionMaksim Pechnikov
2020-08-07added testMaksim Pechnikov
2020-08-06restricted_nicknames: Add names from MastoAPI endpointsAlex Gleason
2020-08-05Define default authenticator in the configMark Felder
2020-08-04Update descriptions in :frontends groupAngelina Filippova
2020-08-04Test Config: Don't have any MRFs by defaultlain
2020-08-04Merge branch 'email-blacklist' into 'develop'lain
Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837
2020-08-04Add label to :restrict_unauthenticated setting, fix typosAngelina Filippova
2020-08-04Update :welcome settings descriptionAngelina Filippova
2020-08-04Fix :args settings description in Upload.Filter.Mogrify groupAngelina Filippova
2020-08-03Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' ↵lain
into 'develop' fixes 1957 Add option to send user chatmessage instead of dm Closes #1957 See merge request pleroma/pleroma!2782
2020-08-03Apply 1 suggestion(s) to 1 file(s)Ilja
2020-08-03Merge branch 'follower-mrf-again' into 'develop'lain
Follower mrf again See merge request pleroma/pleroma!2833
2020-08-03Merge branch 'config/default_ok_oldage' into 'develop'lain
config: :mrf, :policies default to ObjectAgePolicy Closes #2000 See merge request pleroma/pleroma!2814
2020-08-02Add email blacklist, fixes #1404Alex Gleason
2020-08-02Add welcome chatmessagesIlja
* I added the option in config/config.exs * created a new module lib/pleroma/user/welcome_chat_message.ex * Added it to the registration flow * added to the cheatsheet * added to the config/description.ex * added to the Changelog.md
2020-08-01SimpleMRF: Add missing :followers_only to config.exsAlex Gleason
2020-07-31Revert "Merge branch 'revert-1ac0969c' into 'develop'"lain
This reverts merge request !2825
2020-07-31Revert "Merge branch 'mrf-silence-2' into 'develop'"lain
This reverts merge request !2820
2020-07-31Merge branch 'mrf-silence-2' into 'develop'lain
MRF silencing alternative solution See merge request pleroma/pleroma!2820
2020-07-31Default MRF to ObjectAgePolicy, 7 days thresholdHaelwenn (lanodan) Monnier
2020-07-31Config: Default to Hackney againlain
Gun is still acting up.
2020-07-29Merge remote-tracking branch 'upstream/develop' into mrf-silenceAlex Gleason
2020-07-29SimpleMRF: :silence --> :followers_onlyAlex Gleason
2020-07-29Merge remote-tracking branch 'upstream/develop' into hide-reactionsAlex Gleason
2020-07-29Merge branch 'by-approval' into 'develop'lain
Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757
2020-07-28SimpleMRF: Let instances be silencedAlex Gleason
2020-07-28Let favourites and emoji reactions optionally be hiddenAlex Gleason
2020-07-28Clarify location of frontends directoryMark Felder
2020-07-28Docs: Add frontend info to cheat sheet.lain
2020-07-28Add description for configuration.Roman Chvanikov
2020-07-27Add :registration_reason_length to description.exsAlex Gleason
2020-07-27Add configurable registration_reason limitAlex Gleason
2020-07-27Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-27Merge branch 'issue/1934-welcome-email' into 'develop'lain
[#1934] welcome email See merge request pleroma/pleroma!2786
2020-07-26Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-26Update types in Pleroma.Formatter groupAngelina Filippova
2020-07-24remove duplicate moduleMaksim Pechnikov
2020-07-23Merge branch 'develop' into issue/1934-welcome-emailMaksim Pechnikov
2020-07-22Add related_policy fieldAngelina Filippova
2020-07-22fix sender for welcome emailMaksim Pechnikov
2020-07-22update descriptionMaksim Pechnikov
2020-07-21Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"lain
This reverts merge request !2784
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
This reverts merge request !2677
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 03:33:37 +0000