Commit graph

13074 commits

Author SHA1 Message Date
rinpatch
13e324abe9 Merge branch '2053-notifications-actor-is-active-refactoring' into 'develop'
[#2053] `Notification.for_user_query/2` timeout fix

Closes #2053

See merge request pleroma/pleroma!3318
2021-02-16 10:11:41 +00:00
rinpatch
8910303f71 Merge branch 'chore/mailmap' into 'develop'
Add myself to .mailmap

See merge request pleroma/pleroma!3319
2021-02-15 10:30:29 +00:00
rinpatch
e2927d714e Add myself to .mailmap
I changed my email to rin@patch.cx
2021-02-15 13:19:44 +03:00
Ivan Tashkinov
284504f689 [#2053] Changed Notification/for_user_query/2 to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from users. 2021-02-15 09:08:04 +03:00
rinpatch
db716f860a Merge branch 'not-used-mock' into 'develop'
Not used mock

See merge request pleroma/pleroma!3313
2021-02-12 08:52:04 +00:00
rinpatch
76414ad277 Merge branch 'bugfix/answer-outbox' into 'develop'
Add test for Answer presence into an authenticated /outbox

See merge request pleroma/pleroma!3269
2021-02-12 08:48:51 +00:00
Alexander Strizhakov
b5d001fc8c
not used mock 2021-02-10 18:44:49 +03:00
Haelwenn
2cf753c502 Merge branch 'fix/no-version-api-pleroma-social' into 'develop'
Fix no version number on api.pleroma.social

See merge request pleroma/pleroma!3310
2021-02-10 00:52:59 +00:00
rinpatch
a853218701 Merge branch 'features/ap_id-c2s-authentication' into 'develop'
activity_pub_controller: Add authentication to object & activity endpoints

See merge request pleroma/pleroma!3295
2021-02-09 19:29:43 +00:00
rinpatch
0d9230aed9 OpenAPI spec: Do not show build enviroment in the spec version 2021-02-09 22:23:11 +03:00
rinpatch
f13f5d9303 OpenAPI spec task: Load pleroma application to get version info
For whatever reason it seems to pick up the version without loading the
app on my machine, but not on the CI.
2021-02-09 22:10:09 +03:00
fc42e714e2 Merge branch 'new-user-emails' into 'develop'
Basic new user registration email, various improvements

See merge request pleroma/pleroma!3304
2021-02-08 22:47:03 +00:00
6e90b79d63 Lint 2021-02-08 16:40:27 -06:00
4cacce4b42 Revert "Add plaintext support for all emails except the digest"
This reverts commit 5df9f68392.
2021-02-08 16:39:55 -06:00
593c0851d9 Merge branch 'develop' into 'new-user-emails' 2021-02-08 16:01:50 -06:00
Haelwenn
a5bee1bf35 Merge branch 'feat/mrf-noemptypolicy' into 'develop'
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.

See merge request pleroma/pleroma!3309
2021-02-08 21:49:20 +00:00
55a13fc360 MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
Helps prevent accidental button mashes from submitting incomplete posts
2021-02-08 15:32:47 -06:00
rinpatch
17f41a589f Merge branch 'fix/rss-link' into 'develop'
RSS: Make sure post URL is the first `<link>` element

See merge request pleroma/pleroma!3308
2021-02-08 20:14:53 +00:00
rinpatch
ed8ef80b5e RSS: Make sure post URL is the first <link> element
Otherwise some RSS readers (tested in Miniflux) might pick the context
URL as the external link.

Related to #2425.
2021-02-08 22:44:15 +03:00
rinpatch
a52cedba62 Merge branch 'chore/descriptions-improvements' into 'develop'
More descriptions improvements

See merge request pleroma/pleroma!3307
2021-02-08 19:21:01 +00:00
Haelwenn (lanodan) Monnier
8c7b3b20d8
activity_pub_controller: Add authentication to object & activity endpoints 2021-02-08 20:00:47 +01:00
ce7c275fb3 Improve various descriptions and labels 2021-02-08 11:45:50 -06:00
2bffa8e020 Make the suggestion match the default value 2021-02-08 11:25:32 -06:00
ff70d71693 Merge branch 'docs/improve-mailer-settings-desc' into 'develop'
Improve Mailer descriptions for AdminFE

See merge request pleroma/pleroma!3306
2021-02-08 16:49:15 +00:00
85cb122986 Merge branch 'develop' into 'docs/improve-mailer-settings-desc'
# Conflicts:
#   CHANGELOG.md
2021-02-08 16:43:04 +00:00
4dbb08a19f Improved Mailer descriptions 2021-02-08 10:08:33 -06:00
rinpatch
8babd796da Merge branch 'fix/reports-from-admins' into 'develop'
Suppress report notification for admin actors

See merge request pleroma/pleroma!3301
2021-02-08 10:31:20 +00:00
f736501e97 Alpha-sort adapters
Add various labels, descriptions and suggestions for all adapter settings and try to use
the same terminology by the service provider.
2021-02-06 13:18:48 -06:00
0fcf16dcb8 Move Enabled to top as it's the master control of all email. Description not really needed. 2021-02-06 12:34:32 -06:00
bd828e5c9c More description improvements 2021-02-06 12:28:49 -06:00
227dd84f11 Update SMTP error description and default value 2021-02-06 12:06:47 -06:00
9e3e8e2e30 Update Swoosh docs URL, lint 2021-02-06 12:04:28 -06:00
cfc474c5f7 There is no reason to expose these Local adapter settings either. 2021-02-06 12:01:11 -06:00
6ffe15cc9f Remove No MX lookups setting
This setting defaults to false so the relay host will be used in an MX query so
multiple SMTP servers can be used. gen_smtp code states that all records returned from the
MX query are attempted in order and only a permanent SMTP error will stop the client from
attempting other servers in the list. Connection failures, TLS issues, etc will cause it to
try the next host.

If there is no MX record associated with the relay host, it automatically tries connecting to it
directly.

There is really no reason to expose this to end users. The default value is fine for everyone.
2021-02-06 11:55:25 -06:00
85710b026f Improve SMTP adapter setting descriptions 2021-02-06 11:55:01 -06:00
9f98885388 No reason to suggest users try the useless "Local" mail adapter 2021-02-06 11:28:55 -06:00
rinpatch
6e68058b63 Merge branch 'feat/allow_alt_text_search_config' into 'develop'
allow user defined text search config in database

See merge request pleroma/pleroma!3275
2021-02-06 09:42:20 +00:00
hyperion
8d4e0342e1 Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files 2021-02-06 09:42:17 +00:00
4dd28b4bd1 Merge branch 'varnish-large-files' into 'develop'
Improve Varnish VCL

See merge request pleroma/pleroma!3305
2021-02-05 19:46:53 +00:00
1d8f1fe077 Add a default rule to not attempt to cache any files larger than 50MB
This fixes connection failures when trying to retrieve large files.
It is less common in typical Pleroma usage, but it's possible to encounter
this on a cloud instance with lower memory.
2021-02-05 13:35:51 -06:00
0368419fce Slightly better formatting 2021-02-05 09:13:53 -06:00
5df9f68392 Add plaintext support for all emails except the digest 2021-02-05 09:13:17 -06:00
6a3e75c8e6 Lint 2021-02-05 09:00:17 -06:00
c361440396 Add basic test to validate the registration email is dispatched when the others are disabled
Also only check for subject as the body is a mess of html and we don't really need to prove its contents if the subject matches.
2021-02-04 17:56:46 -06:00
95930a7aa5 Actually send the mail 2021-02-04 17:42:09 -06:00
2a863987bc Added: New user registration mail 2021-02-04 16:14:37 -06:00
e945ccc91b Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabled 2021-02-04 15:16:50 -06:00
2956c21a55 Improve confirmation email language 2021-02-04 15:10:43 -06:00
af37a5c51a Also make this maybe_ for consistency 2021-02-04 14:33:49 -06:00
b22b12f738 These welcome emails are not guaranteed and can be private functions 2021-02-04 14:01:15 -06:00