0368419fce
Slightly better formatting
4 years ago
5df9f68392
Add plaintext support for all emails except the digest
4 years ago
6a3e75c8e6
Lint
4 years ago
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
95930a7aa5
Actually send the mail
4 years ago
2a863987bc
Added: New user registration mail
4 years ago
e945ccc91b
Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabled
4 years ago
2956c21a55
Improve confirmation email language
4 years ago
af37a5c51a
Also make this maybe_ for consistency
4 years ago
b22b12f738
These welcome emails are not guaranteed and can be private functions
4 years ago
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
bf9cd4a0e2
Standardize the way we capture and use Mix.env()
4 years ago
7b67bf4e97
Merge branch 'fix/configdb-error' into 'develop'
...
Improve error message for ConfigDB
See merge request pleroma/pleroma!3289
4 years ago
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
ecff027418
Redirect non-local activities when /notice/:id is used
...
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
4 years ago
49741961f2
Merge branch 'chore/external-emoji-example' into 'develop'
...
Stop external emoji example from leaking
See merge request pleroma/pleroma!3302
4 years ago
887db076b5
Load an emoji.txt specific to the test env
4 years ago
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
74ef1a044d
Account schema: specify that pleroma.relationship is nullable
4 years ago
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
c47ca99592
CI: Forgot $ in spec-deploy
4 years ago
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
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
4 years ago
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
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
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
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
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
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
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
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
d0b4a49f16
Merge branch 'develop' into a1batross-develop-patch-62810
4 years ago
c118bdb8f0
Merge branch 'develop' into a1batross-develop-patch-62810
4 years ago
d0c2159b77
Mix pleroma.instance creates parent directories now
4 years ago
d37d4106c6
Merge branch 'fix/majic-nits' into 'develop'
...
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
4 years ago
92efdf9adc
Document OAuth 2.0 provider fqn field addition
4 years ago
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
f852e8d2d2
Document we are disabling the extension fixup in Majic
4 years ago
28d2917c3a
Merge branch 'develop' into fix/majic-nits
4 years ago
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
4 years ago
6a2d3fb9a3
Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'
...
fix and delete purge activities duplicates
Closes #2473
See merge request pleroma/pleroma!3285
4 years ago
b36891d1e6
Merge branch 'feature/2164-unify-api-arguments' into 'develop'
...
Unifying timelines api arguments
Closes #2164
See merge request pleroma/pleroma!3281
4 years ago
22486fb4af
Improve changelog description
4 years ago
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
4 years ago
2012800ed1
Merge branch 'fix/attachment-cleanup' into 'develop'
...
Only run attachment cleanup if enabled
See merge request pleroma/pleroma!3288
4 years ago
69c560cfba
Merge branch 'active-user-count' into 'develop'
...
Monthly Active Users
Closes #2332
See merge request pleroma/pleroma!3283
4 years ago
aacd1c90b7
fix for test warnings
4 years ago
0dc68c157f
fix for scheduled post with poll
4 years ago
fdf1dfed56
only_remote -> remote renaming
4 years ago
ba512cbea4
`/api/v1/accounts/:id/statuses` docs update
4 years ago
Mark Felder