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
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
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
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
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
74ef1a044d
Account schema: specify that pleroma.relationship is nullable
2021-02-03 18:10:43 +03:00
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
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
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
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
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
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
fb25231fbe
Add test for Answer presence into an authenticated /outbox
2021-02-03 12:07:18 +01:00
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
2021-02-03 09:31:38 +03:00
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
2021-02-02 18:37:20 +00:00
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
2021-02-02 18:35:08 +00:00
Mark Felder
d0b4a49f16
Merge branch 'develop' into a1batross-develop-patch-62810
2021-02-02 12:18:03 -06:00
Mark Felder
c118bdb8f0
Merge branch 'develop' into a1batross-develop-patch-62810
2021-02-02 12:16:49 -06:00
Mark Felder
d0c2159b77
Mix pleroma.instance creates parent directories now
2021-02-02 12:16:01 -06:00
feld
d37d4106c6
Merge branch 'fix/majic-nits' into 'develop'
...
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
2021-02-02 18:15:00 +00:00
Mark Felder
92efdf9adc
Document OAuth 2.0 provider fqn field addition
2021-02-02 12:12:37 -06:00
feld
0888815000
Merge branch 'fix/2411-mutes-api' into 'develop'
...
Support for with_relationships parameter
Closes #2411
See merge request pleroma/pleroma!3290
2021-02-02 18:08:46 +00:00
Mark Felder
f852e8d2d2
Document we are disabling the extension fixup in Majic
2021-02-02 12:03:20 -06:00
Mark Felder
28d2917c3a
Merge branch 'develop' into fix/majic-nits
2021-02-02 12:01:48 -06:00
feld
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
2021-02-02 17:57:58 +00:00
feld
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
2021-02-02 17:22:23 +00:00
feld
b36891d1e6
Merge branch 'feature/2164-unify-api-arguments' into 'develop'
...
Unifying timelines api arguments
Closes #2164
See merge request pleroma/pleroma!3281
2021-02-02 17:18:07 +00:00
Mark Felder
22486fb4af
Improve changelog description
2021-02-02 11:15:47 -06:00
feld
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
2021-02-02 17:11:38 +00:00
Mark Felder
Haelwenn