Commit Graph

211 Commits (c5830ac037c0c344bd22b674c41f4dc244a088aa)

Author SHA1 Message Date
Mark Felder 40c847dc2a Spelling
4 years ago
rinpatch a098e10fd6 Document ephemeral activity changes better
4 years ago
Alexander Strizhakov 2c2094d4b2 configurable lifetime for ephemeral activities
4 years ago
Alexander Strizhakov 7dd986a563
expire mfa tokens through Oban
4 years ago
Mark Felder 96697db3bc RelMe and Feed no longer configurable
4 years ago
Mark Felder 21efda2edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
4 years ago
Alibek Omarov efff2caccc docs: cheatsheet: add ForceBotUnlistedPolicy
4 years ago
Alexander Strizhakov a83916fdac
adapter options unification
4 years ago
rinpatch 19691389b9 Rich media: Add failure tracking
4 years ago
lain b76839e008 Cheatsheet: Remove misleading example
4 years ago
lain c1d51944c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
lain 368fd04b47 Cheatsheet: Add information about filename descriptions
4 years ago
lain e154fcf525 Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'
4 years ago
Ivan Tashkinov 60ac83a4c1 [#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
4 years ago
rinpatch 4fcf272717 Docs: Fix the way tabs are declared
4 years ago
feld 14a06e63f6 Merge branch 'fix/activity-expirations-again' into 'develop'
4 years ago
Mark Felder 091da10832 Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria.
4 years ago
Ilja bd7bf6cd19 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Ilja a4a2d38640 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Ilja e0dee833f2 Improve static_dir documentation
4 years ago
Mark Felder 54e2af8293 Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
lain 60fe0a08f0 Docs: Remove wrong / confusing auth docs.
4 years ago
Mark Felder 6ddea8ebe8 Add a note about the proper value for uid
4 years ago
lain 532d6f94ae Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
lain 28584bb224 Merge branch 'email-blacklist' into 'develop'
4 years ago
lain e3953923ac Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
4 years ago
Alex Gleason dc88b6f091
Add email blacklist, fixes #1404
4 years ago
Ilja f671d7e68c Add welcome chatmessages
4 years ago
lain 4b18a07392 Revert "Merge branch 'revert-1ac0969c' into 'develop'"
4 years ago
lain 010d77ec85 Revert "Merge branch 'mrf-silence-2' into 'develop'"
4 years ago
lain 1ac0969c72 Merge branch 'mrf-silence-2' into 'develop'
4 years ago
lain 37b9e5e138 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder 24169ae2e6 Merge branch 'develop' into fix/configdb-otp-instructions
4 years ago
Mark Felder cfc6484c40 OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
4 years ago
Mark Felder 1f24186036 Attempt to fix markdown formatting
4 years ago
Alex Gleason 702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
4 years ago
Alex Gleason 93638935d7
SimpleMRF: :silence --> :followers_only
4 years ago
Alex Gleason d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain 79f9ddd8b7 Merge branch 'by-approval' into 'develop'
4 years ago
lain 54afb35685 Cheatsheet: Update frontends information.
4 years ago
Alex Gleason 3c90f7f715
SimpleMRF: Let instances be silenced
4 years ago
Alex Gleason 3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
lain 81350faa8e Cheatsheet: Add even more info.
4 years ago
lain 393128fb02 Cheatsheet: Add more info.
4 years ago
lain 08732e8a03 Docs: Add frontend info to cheat sheet.
4 years ago
Alex Gleason 520dce857e
Add :registration_reason_length to description.exs
4 years ago
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email
4 years ago