Ivan Tashkinov
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
2020-02-27 18:46:05 +03: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
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
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
feld
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
feld
4f5ee26f2d
Update description.exs
2020-02-13 14:00:33 +00:00
feld
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
feld
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
feld
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
Egor Kislitsyn
3909b5b7b3
Remove AutoLinker scheme option from the config
2020-02-05 21:13:56 +04:00
Ivan Tashkinov
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-05 07:56:36 +03:00
Maksim Pechnikov
2c40c8b4a2
Merge branch 'develop' into issue/1383
2020-02-03 21:42:36 +03:00
Roman Chvanikov
8057157ee3
Make attachments cleanup optional
2020-01-31 01:20:37 +03:00
rinpatch
7499805abf
config.exs: Re-enable rate limiter and enable remote ip
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
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
2020-01-27 13:21:50 +00:00
Alexander Strizhakov
f72727a409
little fixes
2020-01-27 12:53:21 +03:00
Maksim Pechnikov
bfc70fdf29
Merge branch 'develop' into issue/1383
2020-01-27 08:48:19 +03:00
Alexander Strizhakov
5943d78c74
description typos, Oban verbose type fix, new keys
2020-01-25 19:45:51 +03:00
Ivan Tashkinov
86e4d23acb
[ #1505 ] Background fetching of incoming activities' replies collections.
2020-01-25 10:47:30 +03:00
feld
0a5e792454
Merge branch 'fix/better-descriptions-for-email-fields' into 'develop'
...
Better descriptions for email fields for admin-fe
Closes admin-fe#67
See merge request pleroma/pleroma!2138
2020-01-24 13:54:44 +00:00
Alexander Strizhakov
e9d8a84790
better descriptions for email fields for admin-fe
2020-01-24 11:19:12 +03:00
Alexander Strizhakov
b0ae69d996
removing deleted MDII uploader from suggestions
2020-01-24 11:05:03 +03:00
Egor Kislitsyn
3c4a30c6db
Add NewUsersDigestEmail to config/description.exs
2020-01-23 18:53:11 +04:00
Mark Felder
e151dea276
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 15:59:24 -06:00
