aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Expand)Author
2020-08-11Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview...Ivan Tashkinov
2020-08-09Merge branch 'develop' into 'feat/floki-fast-html-2'lain
2020-08-07Merge branch 'develop' into fix/ldap-auth-issuesMark Felder
2020-08-07Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.s...Angelina Filippova
2020-08-07Add new `image` type to settings whose values are image urlsAngelina Filippova
2020-08-07Make Floki use fast_htmlrinpatch
2020-08-07Apply 1 suggestion(s) to 1 file(s)lain
2020-08-07Merge branch 'develop' into feature/update-welcome-setting-in-descriptionMaksim Pechnikov
2020-08-07added testMaksim Pechnikov
2020-08-07Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview...Ivan Tashkinov
2020-08-06restricted_nicknames: Add names from MastoAPI endpointsAlex Gleason
2020-08-06Description: Refactor.lain
2020-08-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bu...lain
2020-08-05Define default authenticator in the configMark Felder
2020-08-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bu...lain
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
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' i...lain
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
2020-08-03Merge branch 'config/default_ok_oldage' into 'develop'lain
2020-08-02Add email blacklist, fixes #1404Alex Gleason
2020-08-02Add TagPolicy as default MRF, #2010Alex Gleason
2020-08-02Add welcome chatmessagesIlja
2020-08-01SimpleMRF: Add missing :followers_only to config.exsAlex Gleason
2020-07-31Revert "Merge branch 'revert-1ac0969c' into 'develop'"lain
2020-07-31Revert "Merge branch 'mrf-silence-2' into 'develop'"lain
2020-07-31Merge branch 'mrf-silence-2' into 'develop'lain
2020-07-31Default MRF to ObjectAgePolicy, 7 days thresholdHaelwenn (lanodan) Monnier
2020-07-31Config: Default to Hackney againlain
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 frontend-bu...lain
2020-07-29Merge branch 'by-approval' into 'develop'lain
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