Commit Graph

212 Commits

Author SHA1 Message Date
rinpatch 0b5e72ecf0 Remove `:managed_config` option.
In practice, it was already removed half a year ago, but the description
 and cheatsheet entries were still there.

The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
 to ConfigDB.

Closes #2086
2020-09-14 18:04:16 +03:00
Mark Felder 40c847dc2a Spelling
Reported by:	trevoke
2020-09-11 17:42:39 -05:00
rinpatch a098e10fd6 Document ephemeral activity changes better
Also remove the example from the cheatsheet, there is no need for it
when the types are simple
2020-09-10 21:52:30 +03:00
Alexander Strizhakov 2c2094d4b2 configurable lifetime for ephemeral activities 2020-09-10 21:51:59 +03:00
Alexander Strizhakov 7dd986a563
expire mfa tokens through Oban 2020-09-10 16:01:19 +03:00
Mark Felder 96697db3bc RelMe and Feed no longer configurable 2020-09-08 20:21:34 +03:00
Mark Felder 21efda2edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted 2020-09-08 09:31:26 -05:00
Alibek Omarov efff2caccc docs: cheatsheet: add ForceBotUnlistedPolicy 2020-09-08 11:34:04 +00:00
Alexander Strizhakov a83916fdac
adapter options unification
not needed options deletion
2020-09-07 19:59:17 +03:00
rinpatch 19691389b9 Rich media: Add failure tracking 2020-09-02 14:59:52 +03:00
lain b76839e008 Cheatsheet: Remove misleading example 2020-08-26 13:53:16 +02:00
lain c1d51944c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads 2020-08-25 11:44:51 +02:00
lain 368fd04b47 Cheatsheet: Add information about filename descriptions 2020-08-18 13:22:00 +02:00
lain e154fcf525 Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'
[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy

Closes #2046

See merge request pleroma/pleroma!2890
2020-08-17 12:26:53 +00:00
Ivan Tashkinov 60ac83a4c1 [#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog. 2020-08-15 18:30:20 +03:00
rinpatch 4fcf272717 Docs: Fix the way tabs are declared
Since python doesn't have a way to lock deps for a particlar project
by default, I didn't bother with it. This resulted in mkdocs updating at
some point, bringing a breaking change to how tabs are declared and
broken tabs on docs-develop.pleroma.social. I've learned my lesson
and locked deps with pipenv in pleroma/docs!5. This MR updates Pleroma
docs to use the new tab style, fortunately my editor did most of it.

Closes #2045
2020-08-15 09:55:59 +03:00
feld 14a06e63f6 Merge branch 'fix/activity-expirations-again' into 'develop'
Fix activity expirations again

See merge request pleroma/pleroma!2866
2020-08-13 17:38:19 +00:00
Mark Felder 091da10832 Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria. 2020-08-12 11:00:01 -05:00
Ilja bd7bf6cd19 Apply 1 suggestion(s) to 1 file(s) 2020-08-10 11:29:54 +00:00
Ilja a4a2d38640 Apply 1 suggestion(s) to 1 file(s) 2020-08-10 11:29:40 +00:00
Ilja e0dee833f2 Improve static_dir documentation
* It was still written for From Source installs. Now it's both OTP and From Source
* I linked to the cheatsheet where it was about configuration
* I moved the mix tasks of the robot.txt section to the CLI tasks and linked to it
    * i checked the code at https://git.pleroma.social/pleroma/pleroma/-/blob/develop/lib/mix/tasks/pleroma/robotstxt.ex and it doesn't seem to more than just this one command with this option
* I also added the location of robot.txt and an example to dissallow everything, but allow the fediverse.network crawlers
* The Thumbnail section still linked to distsn.org which doesn't exist any more. I changed it to a general statemant that it can be used by external applications. (I don't know any that actually use it.)
* Both the logo and TOS need an extra `static` folder. I've seen confusion about that in #pleroma so I added an Important note.
2020-08-08 12:21:44 +02:00
Mark Felder 54e2af8293 Merge branch 'develop' into fix/ldap-auth-issues 2020-08-07 14:55:22 -05:00
lain 60fe0a08f0 Docs: Remove wrong / confusing auth docs. 2020-08-07 17:59:55 +02:00
Mark Felder 6ddea8ebe8 Add a note about the proper value for uid 2020-08-07 09:42:10 -05:00
lain 532d6f94ae Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads 2020-08-04 15:10:36 +02:00
lain 28584bb224 Merge branch 'email-blacklist' into 'develop'
Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837
2020-08-04 11:00:30 +00:00
lain e3953923ac Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
fixes 1957 Add option to send user chatmessage instead of dm

Closes #1957

See merge request pleroma/pleroma!2782
2020-08-03 21:01:56 +00:00
Alex Gleason dc88b6f091
Add email blacklist, fixes #1404 2020-08-02 14:53:42 -05:00
Ilja f671d7e68c Add welcome chatmessages
* 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-02 15:54:59 +02:00
lain 4b18a07392 Revert "Merge branch 'revert-1ac0969c' into 'develop'"
This reverts merge request !2825
2020-07-31 15:18:04 +00:00
lain 010d77ec85 Revert "Merge branch 'mrf-silence-2' into 'develop'"
This reverts merge request !2820
2020-07-31 15:17:09 +00:00
lain 1ac0969c72 Merge branch 'mrf-silence-2' into 'develop'
MRF silencing alternative solution

See merge request pleroma/pleroma!2820
2020-07-31 14:43:33 +00:00
lain 37b9e5e138 Apply 1 suggestion(s) to 1 file(s) 2020-07-31 10:29:16 +00:00
Mark Felder 24169ae2e6 Merge branch 'develop' into fix/configdb-otp-instructions 2020-07-30 13:04:49 -05:00
Mark Felder cfc6484c40 OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions. 2020-07-30 12:37:56 -05:00
Mark Felder 1f24186036 Attempt to fix markdown formatting 2020-07-30 12:01:46 -05:00
Alex Gleason 702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence 2020-07-29 13:01:16 -05:00
Alex Gleason 93638935d7
SimpleMRF: :silence --> :followers_only 2020-07-29 12:58:08 -05:00
Alex Gleason d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions 2020-07-29 12:43:39 -05:00
lain dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin 2020-07-29 16:24:22 +02:00
lain 79f9ddd8b7 Merge branch 'by-approval' into 'develop'
Registrations "by approval" mode

Closes #1931

See merge request pleroma/pleroma!2757
2020-07-29 11:27:26 +00:00
lain 54afb35685 Cheatsheet: Update frontends information. 2020-07-29 13:06:51 +02:00
Alex Gleason 3c90f7f715
SimpleMRF: Let instances be silenced 2020-07-28 19:06:42 -05:00
Alex Gleason 3b7c454418
Let favourites and emoji reactions optionally be hidden 2020-07-28 14:58:30 -05:00
lain 81350faa8e Cheatsheet: Add even more info. 2020-07-28 17:50:32 +02:00
lain 393128fb02 Cheatsheet: Add more info. 2020-07-28 17:48:35 +02:00
lain 08732e8a03 Docs: Add frontend info to cheat sheet. 2020-07-28 17:46:37 +02:00
Alex Gleason 520dce857e
Add :registration_reason_length to description.exs 2020-07-27 15:24:20 -05:00
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-27 12:29:18 -05:00
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-26 15:46:14 -05:00