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
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
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
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
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
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