Commit graph

660 commits

Author SHA1 Message Date
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
509c81e4b1
Merge branch 'develop' into gun 2020-03-03 10:08:07 +03:00
lain
4c02e04935 Merge branch 'prepared-statements-settings' into 'develop'
Prepared statements settings

See merge request pleroma/pleroma!2238
2020-03-02 17:00:04 +00:00
Alexander Strizhakov
2622cf1190
returning repo parameters 2020-03-02 09:22:34 +03: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
rinpatch
19e559fe51 Merge branch 'rate-limiter-runtime-settings' into 'develop'
RateLimiter improvements: runtime configurability, no default limits in tests

See merge request pleroma/pleroma!2250
2020-02-29 21:52:33 +00:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun 2020-02-29 11:34:50 +03:00
Alexander Strizhakov
04b03e4762
streamer group & Oban crontab child 2020-02-29 11:26:34 +03:00
Steven Fuchs
fabcd82f4a add confirm field to filtered params 2020-02-28 04:27:50 +00: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
2076c9f8c8
unnecessary groups 2020-02-26 19:50:07 +03:00
lain
f71aa644b1 Add :unnamed option to default database configuration 2020-02-25 11:53:30 +01:00
Haelwenn
1e1156b645 Merge branch '1505-threads-federation' into 'develop'
[#1505] Threads / replies federation

Closes #1505

See merge request pleroma/pleroma!2129
2020-02-24 07:28:35 +00:00
Mark Felder
9fe60c3b9c Add missing invites_enabled and account_activation_required settings 2020-02-22 09:29:05 -06:00
Ivan Tashkinov
8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
#	CHANGELOG.md
#	config/config.exs
2020-02-22 09:31:43 +03:00
Alexander Strizhakov
a03c420b84
by default don't use gun retries
remove conn depends on retry setting from config
2020-02-21 12:32:42 +03:00
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun 2020-02-21 10:02:37 +03:00
Mark Felder
b6bb73f43e Apply database session parameter to improve GIN full text search 2020-02-20 15:34:10 -06:00
Ivan Tashkinov
0d14c3f410 [#1505] Typo fix. 2020-02-20 15:18:28 +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
Ivan Tashkinov
0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
#	config/config.exs
2020-02-20 15:00:48 +03: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
Ivan Tashkinov
61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-18 17:46:09 +03:00
Alexander Strizhakov
514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
Ivan Tashkinov
269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction). 2020-02-15 20:41:38 +03:00
Mark Felder
0afff36cda Formatting got me again 2020-02-13 12:09:11 -06:00
Mark Felder
21dc3e3812 Even more description improvements 2020-02-13 12:01:13 -06:00
Mark Felder
aac7f30eb2 Add missing Oban job for attachments_cleanup 2020-02-13 11:49:19 -06:00
Mark Felder
1c52cf933f More description cleanup work 2020-02-13 11:45:58 -06:00
Mark Felder
9218f893d7 More description cleanups 2020-02-13 11:31:02 -06:00
b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
# Conflicts:
#   config/description.exs
2020-02-13 14:37:55 +00:00
Mark Felder
571a475c7e Formatting 2020-02-13 08:02:33 -06:00
Mark Felder
9b778dc54a Formatting 2020-02-13 08:01:39 -06:00
4f5ee26f2d Update description.exs 2020-02-13 14:00:33 +00:00
e4016f4dbd Apply suggestion to config/description.exs 2020-02-13 13:59:47 +00:00
Mark Felder
ff9fd4ca89 Fix the confusingly named and inverted logic of "no_attachment_links"
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
2020-02-11 15:39:19 -06:00
Mark Felder
9581d57382 First round at cleaning up descriptions 2020-02-11 15:21:36 -06:00
Egor Kislitsyn
50d9fcbe29
Hotlink logo instead of attachment 2020-02-11 23:33:05 +04:00
237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
rinpatch
ea1631d7e6 Make Floki use fast_html 2020-02-11 16:17:21 +03:00
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest 2020-02-11 13:54:55 +04:00
Alexander Strizhakov
bfd16fe41e
set oban crontab to false in tests 2020-02-11 12:19:06 +03:00
Maksim Pechnikov
6813c0302c Merge branch 'develop' into issue/1383 2020-02-10 20:49:20 +03:00
Ivan Tashkinov
4e6bbdc7b5 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-08 19:59:37 +03:00
Ivan Tashkinov
d458f4fdca [#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation. 2020-02-08 19:58:02 +03:00
Alexander Strizhakov
7a2e153a8d
description change 2020-02-06 13:15:23 +03:00
Alexander Strizhakov
bdf0a87be9
dropdown type 2020-02-06 12:50:37 +03:00
b21e59da5f Merge branch 'remove-linker-scheme-option' into 'develop'
Remove AutoLinker `scheme` option from the config

See merge request pleroma/pleroma!2176
2020-02-05 20:32:45 +00:00