Commit graph

189 commits

Author SHA1 Message Date
Ivan Tashkinov
3e08e77151 [#1895] Made hashtag timeline respect :restrict_unauthenticated instance setting. 2020-07-07 20:37:11 +03:00
lain
2e21ae1b6d Docs: Add description limits to cheat sheet 2020-07-06 11:08:53 +02:00
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
Haelwenn
c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
Ilja
1e089cdf29 I forgot to git add some files, oops (should be squashed with MR) 2020-06-22 14:18:55 +02:00
Haelwenn (lanodan) Monnier
15ba539258
cheatsheet.md: no_attachment_links → attachment_links 2020-06-20 11:39:06 +02:00
Alexander Strizhakov
b66e6eb521
fixes for tests 2020-06-16 19:03:45 +03:00
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group 2020-06-16 18:32:18 +03:00
Maksim Pechnikov
579763126f Merge branch 'develop' into issue/1855 2020-06-15 15:24:55 +03:00
Maksim Pechnikov
2e8a236cef fix invalidates media url's 2020-06-14 21:02:57 +03:00
href
cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy 2020-06-13 12:08:46 +03:00
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-06-01 15:48:51 +04:00
lain
af3568a6d9 Docs: sql -> SQL 2020-05-25 19:26:07 +02:00
lain
6a85fe1f9d Docs: Document reasonable Postgres settings. 2020-05-25 15:53:14 +02:00
Roman Chvanikov
8eb1dfadca Update CHANGELOG and docs 2020-05-22 18:30:13 +03:00
lain
a42a0716ec Merge branch 'features/emoji_stealer' into 'develop'
MRF.StealEmojiPolicy: New Policy

See merge request pleroma/pleroma!2385
2020-05-21 13:31:49 +00:00
lain
6dd1575c64 Merge branch 'issue/1509' into 'develop'
[#1509]  purge media from cache after delete

See merge request pleroma/pleroma!2539
2020-05-20 10:35:36 +00:00
Maksim Pechnikov
ed442a225a removed Quantum from docs 2020-05-19 06:15:42 +03:00
Maksim Pechnikov
5f0a3ac74d added tests 2020-05-19 06:05:09 +03:00
lain
15c7e3b4bf Merge branch 'docs/storing-remote-media' into 'develop'
Document how to store remote media permanently

See merge request pleroma/pleroma!1871
2020-05-18 11:59:07 +00:00
Maksim Pechnikov
c33a4315fb updated docs 2020-05-18 06:48:19 +03:00
Stephanie Wilde-Hobbs
80308c5c26
Add config migration disclaimer to config whitelist documentation 2020-05-14 15:56:14 +01:00
Stephanie Wilde-Hobbs
20cbfb5cb5
Allow whitelisting whole groups 2020-05-14 12:43:53 +01:00
lain
41db52729e Apply suggestion to docs/configuration/storing_remote_media.md 2020-05-14 09:14:59 +00:00
Haelwenn (lanodan) Monnier
e688d4ee69
MRF.StealEmojiPolicy: New Policy
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
2020-05-14 09:59:56 +02:00
Stephanie Wilde-Hobbs
620247a015
Add database configuration whitelist 2020-05-12 17:12:27 +01:00
Maksim
3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
Mark Felder
d7537a37c7 Add :chat to cheatsheet 2020-05-06 08:55:09 -05:00
Egor Kislitsyn
cc922e7d8c
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate 2020-05-05 15:01:33 +04:00
Egor Kislitsyn
764b4f95a8
Merge branch 'develop' into global-status-expiration 2020-04-28 14:13:53 +04:00
Alex Gleason
1bd9749a8f
Let blob: pass CSP 2020-04-26 00:29:42 -05:00
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration 2020-04-24 18:37:58 +04:00
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration 2020-04-20 20:37:56 +04:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes 2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy 2020-04-20 10:11:06 -05:00
lain
617a9f6208 Merge branch 'mrf-docs-update' into 'develop'
Expand MRF SimplePolicy docs

See merge request pleroma/pleroma!2370
2020-04-20 12:57:45 +00:00
Ilja
aa0a4a1e78 small fix in the rewrite_policy example 2020-04-15 19:03:27 +02:00
Alex Gleason
ed894802d5
Expand MRF SimplePolicy docs 2020-04-12 18:46:47 -05:00
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration 2020-04-10 14:20:48 +04:00
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration 2020-03-20 22:08:34 +04:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun 2020-03-20 20:47:54 +03:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun 2020-03-18 14:08:21 +03:00
Mark Felder
8dd01b24d2 Improve documentation of mrf_object_age 2020-03-16 11:44:53 -05:00
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration 2020-03-16 15:31:31 +04:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
rinpatch
e87a32bcd7 rip out fetch_initial_posts
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.

idea acked by lain and feld on irc

Closes #1595 #1422
2020-03-15 15:59:17 +03:00
Alexander Strizhakov
b34bc669b9
adding descriptions 2020-03-04 20:09:18 +03:00
Alexander Strizhakov
8d9dee1ba9
retry_timeout description change 2020-03-04 08:56:36 +03:00
Alexander Strizhakov
8854770fc4
retry and retry_timeout settings default change 2020-03-03 18:01:35 +03:00
Alexander Strizhakov
28ed4b41d0
naming for checkin from pool timeout 2020-03-03 13:05:28 +03:00
Alexander Strizhakov
df3c59d928 Apply suggestion to docs/configuration/cheatsheet.md 2020-03-03 09:45:18 +00:00
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun 2020-03-03 10:08:07 +03:00
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-03-03 00:32:34 +04:00
Mark Felder
f987d83885 Clarify in docs how to control connections_pool for Gun.
It could easily be confused with the Hackney settings.
2020-03-02 13:00:05 -06:00
ilja
036e8a40a2 fix for :fetch_initial_posts
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
2020-03-02 10:29:24 +01:00
Ilja
53ef8c11b9 Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users)
I also made a more explicit distinction between OTP and from source installs in the general explanation
2020-03-01 19:16:54 +00:00
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun 2020-03-01 12:48:49 +03:00
rinpatch
ffcebe7e22 timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user 2020-03-01 01:13:08 +03:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun 2020-02-29 11:34:50 +03:00
Ivan Tashkinov
6f2efb1c45 Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests. 2020-02-27 18:46:05 +03:00
Alexander Strizhakov
6b012ddd69
some docs 2020-02-25 19:01:29 +03:00
Ilja
c0146f4859 DOCS Theming your instance
I added a new file to explain
* where a custom theme can be created
* where themes can be downloaded
* where to add the theme on the server
* how to make the theme available on the instance
* how to set the theme as default on the instance
2020-02-24 17:48:18 +00:00
Egor Kislitsyn
011ede4536
Update documentation 2020-02-21 14:42:43 +04:00
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun 2020-02-21 10:02:37 +03:00
lain
3eddd9caa6 Merge branch 'require-signature' into 'develop'
Add an option to require fetches to be signed

Closes #1444

See merge request pleroma/pleroma!2071
2020-02-20 12:13:21 +00:00
lain
e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop'
New users digest email

Closes #1514

See merge request pleroma/pleroma!2128
2020-02-20 11:58:37 +00:00
53a7680c16 Merge branch 'develop' into 'fix/mrf-sample-doc'
# Conflicts:
#   docs/configuration/mrf.md
2020-02-18 20:58:15 +00:00
3416948cdf Merge branch 'fix/mrf-docs' into 'develop'
Fix MRF documentation

See merge request pleroma/pleroma!2187
2020-02-18 20:57:23 +00:00
Alexander Strizhakov
514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
Mark Felder
589bffa57d Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc 2020-02-14 11:06:04 -06:00
Mark Felder
31749559e1 Fix MRF docs further. I don't think anyone has actually tested with the old docs. 2020-02-14 11:04:27 -06:00
6caf6a86c5 Apply suggestion to docs/configuration/mrf.md 2020-02-14 16:55:52 +00:00
Mark Felder
88a76d0142 Update suggested path for location of your custom MRF 2020-02-14 10:55:18 -06:00
Egor Kislitsyn
0ddcd67d32
Update cheatsheet.md and config/description.exs 2020-02-14 16:53:53 +04:00
Mark Felder
2c95b0fab9 Make the sample code actually compile 2020-02-13 15:19:01 -06:00
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest 2020-02-11 13:54:55 +04:00
Maksim Pechnikov
6813c0302c Merge branch 'develop' into issue/1383 2020-02-10 20:49:20 +03:00
Egor Kislitsyn
815f659ed8
Fix MRF documentation 2020-02-07 22:17:08 +04:00
rinpatch
6722dade42 Simplify in-database config docs
Large part of it was no longer true (i.e none of the changes need
recompilation anymore and you can't brick an instance by changing them,
it's not necessary to manually truncate the db manually anymore)
2020-02-06 15:00:33 +03:00
Lain Soykaf
90b862e7ab Add cheatsheet entry 2020-02-04 16:22:13 +01:00
Maksim Pechnikov
2c40c8b4a2 Merge branch 'develop' into issue/1383 2020-02-03 21:42:36 +03:00
lain
01537cc1d6 Apply suggestion to docs/configuration/cheatsheet.md 2020-01-30 18:28:28 +00:00
rinpatch
ff4bef140a Apply suggestion to docs/configuration/cheatsheet.md 2020-01-30 13:24:24 +00:00
rinpatch
889965141a RemoteIp: only trust X-Forwarded-For
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
2020-01-30 00:06:58 +03:00
rinpatch
f5cb2af85a cheatsheet: improve rate limiter docs and add new limiters 2020-01-30 00:06:58 +03:00
Maksim Pechnikov
21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
dabd535e43 Remove user recommendation by third party engine 2020-01-27 13:21:50 +00:00
Mark Felder
4c59e9477a Merge branch 'feature/new-registrations-digest' of git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest 2020-01-22 15:59:37 -06:00
Egor Kislitsyn
b8b90d967a
Update documentation 2020-01-22 22:28:06 +04:00
Maksim Pechnikov
cf19bf3c7c Merge branch 'develop' into issue/1383 2020-01-22 20:20:39 +03:00
Maksim
e761d76e4f Apply suggestion to docs/configuration/cheatsheet.md 2020-01-22 16:58:50 +00:00
Maksim
d43c9ab286 Apply suggestion to docs/configuration/cheatsheet.md 2020-01-22 16:58:43 +00:00
Maksim Pechnikov
b7908844f2 Merge branch 'develop' into issue/1383 2020-01-13 12:41:07 +03:00
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
and moving it from instance settings
2020-01-10 19:34:19 +03:00
Alexander Strizhakov
00aff5f78c
syncing new setting to descriptions.exs 2020-01-10 17:54:54 +03:00
RX14
b55f2563d0
Fix SMTP mailer example
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail.
2020-01-05 19:00:48 +00:00
Maksim Pechnikov
54c9db38c8 Merge branch 'develop' into issue/1383 2019-12-21 20:38:59 +03:00
Egor Kislitsyn
36d66d9655
Fix typo 2019-12-17 02:06:58 +07:00
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed 2019-12-16 22:24:03 +07:00