squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,101 Commits 154 Branches 42 Tags 503 MiB
c1d63bbd9a
Commit Graph

13101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
feld
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
feld
85cb122986 Merge branch 'develop' into 'docs/improve-mailer-settings-desc' 
# Conflicts:
#   CHANGELOG.md
 2021-02-08 16:43:04 +00:00
Mark Felder
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
Mark Felder
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
Mark Felder
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
Mark Felder
bd828e5c9c More description improvements 2021-02-06 12:28:49 -06:00
Mark Felder
227dd84f11 Update SMTP error description and default value 2021-02-06 12:06:47 -06:00
Mark Felder
9e3e8e2e30 Update Swoosh docs URL, lint 2021-02-06 12:04:28 -06:00
Mark Felder
cfc474c5f7 There is no reason to expose these Local adapter settings either. 2021-02-06 12:01:11 -06:00
Mark Felder
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
Mark Felder
85710b026f Improve SMTP adapter setting descriptions 2021-02-06 11:55:01 -06:00
Mark Felder
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
feld
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
Mark Felder
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
Mark Felder
0368419fce Slightly better formatting 2021-02-05 09:13:53 -06:00
Mark Felder
5df9f68392 Add plaintext support for all emails except the digest 2021-02-05 09:13:17 -06:00
Mark Felder
6a3e75c8e6 Lint 2021-02-05 09:00:17 -06:00
Mark Felder
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
Mark Felder
95930a7aa5 Actually send the mail 2021-02-04 17:42:09 -06:00
Mark Felder
2a863987bc Added: New user registration mail 2021-02-04 16:14:37 -06:00
Mark Felder
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
Mark Felder
2956c21a55 Improve confirmation email language 2021-02-04 15:10:43 -06:00
Mark Felder
af37a5c51a Also make this maybe_ for consistency 2021-02-04 14:33:49 -06:00
Mark Felder
b22b12f738 These welcome emails are not guaranteed and can be private functions 2021-02-04 14:01:15 -06:00
Mark Felder
d047372291 Merge branch 'develop' into fix/reports-from-admins 2021-02-04 12:37:20 -06:00
feld
d7262f7d22 Merge branch 'chore/fix-mix-env' into 'develop' 
Standardize the way we capture and use Mix.env()

See merge request pleroma/pleroma!3303
 2021-02-04 16:27:05 +00:00
Mark Felder
bf9cd4a0e2 Standardize the way we capture and use Mix.env() 2021-02-04 10:13:03 -06:00
feld
7b67bf4e97 Merge branch 'fix/configdb-error' into 'develop' 
Improve error message for ConfigDB

See merge request pleroma/pleroma!3289
 2021-02-04 14:33:59 +00:00
Haelwenn
ea5469961a Merge branch 'bugfix/notice-external-redirect' into 'develop' 
Redirect non-local activities when /notice/:id is used

See merge request pleroma/pleroma!3300
 2021-02-04 14:26:03 +00:00
Haelwenn (lanodan) Monnier
ecff027418
Redirect non-local activities when /notice/:id is used 
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
 2021-02-04 15:17:40 +01:00
Haelwenn
49741961f2 Merge branch 'chore/external-emoji-example' into 'develop' 
Stop external emoji example from leaking

See merge request pleroma/pleroma!3302
 2021-02-04 14:05:30 +00:00
Mark Felder
887db076b5 Load an emoji.txt specific to the test env 2021-02-03 16:40:59 -06:00
Mark Felder
000d3365c3 Document admin actors not getting report notifications 2021-02-03 14:52:49 -06:00
Mark Felder
5bb5949048 Validate admin making report doesn't get their own report notification, but other admins do 2021-02-03 12:54:53 -06:00
Mark Felder
76f732766b Exclude reporter from receiving notifications from their own reports. 
Currently only works if the reporting actor is an admin, but if we include
moderators with those who receive notification reports it will work for them.
 2021-02-03 12:32:44 -06:00
rinpatch
a7864a9429 Merge branch 'fix/openapi-relationship-nullable' into 'develop' 
Account schema: specify that pleroma.relationship is nullable

See merge request pleroma/pleroma!3299
 2021-02-03 15:14:40 +00:00
rinpatch
74ef1a044d Account schema: specify that pleroma.relationship is nullable 2021-02-03 18:10:43 +03:00
rinpatch
d2acf3a92f Merge branch 'fix/deploy-api-docs-2-electric-boogalo' into 'develop' 
CI: Forgot $ in spec-deploy

See merge request pleroma/pleroma!3298
 2021-02-03 15:01:08 +00:00
rinpatch
c47ca99592 CI: Forgot $ in spec-deploy 2021-02-03 18:00:04 +03:00
feld
859309e116 Merge branch 'fix/2412-filters' into 'develop' 
Support for expires_in/expires_at in filters

Closes #2412

See merge request pleroma/pleroma!3279
 2021-02-03 14:36:35 +00:00
feld
008499f65a Merge branch 'develop' into 'fix/2412-filters' 
# Conflicts:
#   CHANGELOG.md
 2021-02-03 14:23:23 +00:00
feld
c3dd860a02 Merge branch 'fix/2449-scheduled-poll-bug' into 'develop' 
Fix for scheduled post with poll

Closes #2449

See merge request pleroma/pleroma!3294
 2021-02-03 14:22:23 +00:00
feld
8d2ea95402 Merge branch 'feature/2438-users-posts-total-count' into 'develop' 
Feature/2438 users/instances posts total count

Closes #2438

See merge request pleroma/pleroma!3270
 2021-02-03 14:21:57 +00:00
rinpatch
5ee9cbf017 Merge branch 'fix/deploy-api-docs' into 'develop' 
CI: Add job ref when calling api docs builder

See merge request pleroma/pleroma!3297
 2021-02-03 14:03:24 +00:00
rinpatch
00268b4476 CI: Add job ref when calling api docs builder 
Just grabbing the latest artifact for the branch does not work because
gitlab will only change the latest artifact when the whole pipeline
finishes
 2021-02-03 17:02:06 +03:00
rinpatch
e2d7c4fd57 Merge branch 'feat/openapi-spec-export' into 'develop' 
Improve OpenAPI spec and deploy it to api.pleroma.social

See merge request pleroma/pleroma!3296
 2021-02-03 13:21:19 +00:00
rinpatch
9fcff7851f Improve OpenAPI spec and deploy it to api.pleroma.social 
Too many changes in OpenAPI spec to describe each one, but
basically it is tag fixes, bringing consitency to operation summaries
and fixing some incorrect information.
 2021-02-03 16:07:44 +03:00