aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
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-03Description: Add new fields for frontend configuration.lain
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 TagPolicy as default MRF, #2010Alex 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-30Config: Add kenoma as available frontend.lain
2020-07-30Config: Add frontend information.lain
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-29Descriptions: Update with admin frontend infolain
2020-07-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-admin
2020-07-29Merge branch 'by-approval' into 'develop'lain
Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757
2020-07-29Config: Update frontend config examplelain
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
2020-07-21added welcome emailMaksim Pechnikov
2020-07-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs
2020-07-16description.exs typofixesAlex Gleason
2020-07-16Merge remote-tracking branch 'upstream/develop' into linkifyAlex Gleason
2020-07-15Merge branch 'develop' into refactor/gun-pool-registryMark Felder
2020-07-15Bring back oban job pruningrinpatch
Closes #1945
2020-07-15config.exs: set gun retries to 0rinpatch
The new pooling code just removes the connection when it's down, there is no need to reconnect a connection that is just sitting idle, better just open a new one next time it's needed
2020-07-15config.exs: make gun the default againrinpatch
2020-07-15Add documentation for new connection pool settings and remove somerinpatch
`:retry_timeout` and `:retry` got removed because reconnecting on failure is something the new pool intentionally doesn't do. `:max_overflow` had to go in favor of `:max_waiting`, I didn't reuse the key because the settings are very different in their behaviour. `:checkin_timeout` got removed in favor of `:connection_acquisition_wait`, I didn't reuse the key because the settings are somewhat different. I didn't do any migrations/deprecation warnings/changelog entries because these settings were never in stable.