aboutsummaryrefslogtreecommitdiff
path: root/docs
AgeCommit message (Collapse)Author
2020-08-04Merge branch 'email-blacklist' into 'develop'lain
Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837
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-03Docs: Add info about installing from a local path.lain
2020-08-03Docs: Document installation of frontendslain
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
2020-08-03Merge branch 'follower-mrf-again' into 'develop'lain
Follower mrf again See merge request pleroma/pleroma!2833
2020-08-02Add email blacklist, fixes #1404Alex Gleason
2020-08-02Add indigenous to clientsswentel
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-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-31Apply 1 suggestion(s) to 1 file(s)lain
2020-07-30Fix example json responseMark Felder
2020-07-30Merge branch 'develop' into fix/configdb-otp-instructionsMark Felder
2020-07-30OTP users need Pleroma running to execute pleroma_ctl, so reorganize ↵Mark Felder
instructions.
2020-07-30Attempt to fix markdown formattingMark Felder
2020-07-30Merge branch 'hide-reactions' into 'develop'lain
Let favourites and emoji reactions optionally be hidden See merge request pleroma/pleroma!2804
2020-07-29Expose seconds_valid in Pleroma Captcha API endpointMark Felder
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 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-admin
2020-07-29Merge branch 'issue/1023' into 'develop'lain
[#1023] added generated `pleroma.env` See merge request pleroma/pleroma!2763
2020-07-29Merge branch 'by-approval' into 'develop'lain
Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757
2020-07-29Cheatsheet: Update frontends information.lain
2020-07-28SimpleMRF: Let instances be silencedAlex Gleason
2020-07-28Let favourites and emoji reactions optionally be hiddenAlex Gleason
2020-07-28Cheatsheet: Add even more info.lain
2020-07-28Cheatsheet: Add more info.lain
2020-07-28Docs: Add frontend info to cheat sheet.lain
2020-07-27Add :registration_reason_length to description.exsAlex Gleason
2020-07-27Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-26Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-23Merge branch 'develop' into issue/1934-welcome-emailMaksim Pechnikov
2020-07-22fix sender for welcome emailMaksim Pechnikov
2020-07-22Merge branch 'develop' into issue/1023Maksim 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-21Merge branch 'linkify' into 'develop'lain
AutoLinker --> Linkify, update to latest version See merge request pleroma/pleroma!2677
2020-07-21added welcome emailMaksim Pechnikov
2020-07-17Add account aliasesAlex Gleason
2020-07-17Expose the post formats in /api/v1/instanceMark Felder
2020-07-16Merge remote-tracking branch 'upstream/develop' into linkifyAlex Gleason
2020-07-16fix docsMaksim Pechnikov
2020-07-16Merge branch 'develop' into issue/1023Maksim Pechnikov
2020-07-15Merge branch 'develop' into refactor/gun-pool-registryMark Felder
2020-07-15Merge branch 'develop' into refactor/notification_settingsMark Felder
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.
2020-07-14Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-14AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpointAlex Gleason