Mark Felder
85710b026f
Improve SMTP adapter setting descriptions
4 years ago
Mark Felder
9f98885388
No reason to suggest users try the useless "Local" mail adapter
4 years ago
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
4 years ago
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
4 years ago
feld
4dd28b4bd1
Merge branch 'varnish-large-files' into 'develop'
...
Improve Varnish VCL
See merge request pleroma/pleroma!3305
4 years ago
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.
4 years ago
Mark Felder
0368419fce
Slightly better formatting
4 years ago
Mark Felder
5df9f68392
Add plaintext support for all emails except the digest
4 years ago
Mark Felder
6a3e75c8e6
Lint
4 years ago
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.
4 years ago
Mark Felder
95930a7aa5
Actually send the mail
4 years ago
Mark Felder
2a863987bc
Added: New user registration mail
4 years ago
Mark Felder
e945ccc91b
Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabled
4 years ago
Mark Felder
2956c21a55
Improve confirmation email language
4 years ago
Mark Felder
af37a5c51a
Also make this maybe_ for consistency
4 years ago
Mark Felder
b22b12f738
These welcome emails are not guaranteed and can be private functions
4 years ago
Mark Felder
d047372291
Merge branch 'develop' into fix/reports-from-admins
4 years ago
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
4 years ago
Mark Felder
bf9cd4a0e2
Standardize the way we capture and use Mix.env()
4 years ago
feld
7b67bf4e97
Merge branch 'fix/configdb-error' into 'develop'
...
Improve error message for ConfigDB
See merge request pleroma/pleroma!3289
4 years ago
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
4 years ago
Haelwenn (lanodan) Monnier
ecff027418
Redirect non-local activities when /notice/:id is used
...
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
4 years ago
Haelwenn
49741961f2
Merge branch 'chore/external-emoji-example' into 'develop'
...
Stop external emoji example from leaking
See merge request pleroma/pleroma!3302
4 years ago
Mark Felder
887db076b5
Load an emoji.txt specific to the test env
4 years ago
Mark Felder
000d3365c3
Document admin actors not getting report notifications
4 years ago
Mark Felder
5bb5949048
Validate admin making report doesn't get their own report notification, but other admins do
4 years ago
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.
4 years ago
rinpatch
a7864a9429
Merge branch 'fix/openapi-relationship-nullable' into 'develop'
...
Account schema: specify that pleroma.relationship is nullable
See merge request pleroma/pleroma!3299
4 years ago
rinpatch
74ef1a044d
Account schema: specify that pleroma.relationship is nullable
4 years ago
rinpatch
d2acf3a92f
Merge branch 'fix/deploy-api-docs-2-electric-boogalo' into 'develop'
...
CI: Forgot $ in spec-deploy
See merge request pleroma/pleroma!3298
4 years ago
rinpatch
c47ca99592
CI: Forgot $ in spec-deploy
4 years ago
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
4 years ago
feld
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
4 years ago
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
4 years ago
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
4 years ago
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
4 years ago
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
4 years ago
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
4 years ago
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.
4 years ago
Haelwenn (lanodan) Monnier
fb25231fbe
Add test for Answer presence into an authenticated /outbox
4 years ago
Ivan Tashkinov
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
4 years ago
feld
fd2477dfba
Merge branch 'a1batross-develop-patch-62810' into 'develop'
...
mix: instance: ensure all needed folders are created before generating config
See merge request pleroma/pleroma!3284
4 years ago
feld
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
4 years ago
Mark Felder
d0b4a49f16
Merge branch 'develop' into a1batross-develop-patch-62810
4 years ago
Mark Felder
c118bdb8f0
Merge branch 'develop' into a1batross-develop-patch-62810
4 years ago
Mark Felder
d0c2159b77
Mix pleroma.instance creates parent directories now
4 years ago
feld
d37d4106c6
Merge branch 'fix/majic-nits' into 'develop'
...
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
4 years ago
Mark Felder
92efdf9adc
Document OAuth 2.0 provider fqn field addition
4 years ago
feld
0888815000
Merge branch 'fix/2411-mutes-api' into 'develop'
...
Support for with_relationships parameter
Closes #2411
See merge request pleroma/pleroma!3290
4 years ago
Mark Felder
f852e8d2d2
Document we are disabling the extension fixup in Majic
4 years ago