akkoma
3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Tue, 23 Feb 2021 10:58:35 +0000 (13:58 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex

3 years ago[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
Ivan Tashkinov [Tue, 23 Feb 2021 10:52:28 +0000 (13:52 +0300)]
[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.

3 years agoMerge branch '2534-pleroma-endpoint-earlier-init' into 'develop'
rinpatch [Tue, 23 Feb 2021 10:01:09 +0000 (10:01 +0000)]
Merge branch '2534-pleroma-endpoint-earlier-init' into 'develop'

[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer)

Closes #2534

See merge request pleroma/pleroma!3338

3 years agoApply i1t's suggestion(s) to 1 file(s)
Ivan Tashkinov [Mon, 22 Feb 2021 20:41:57 +0000 (20:41 +0000)]
Apply i1t's suggestion(s) to 1 file(s)

3 years ago[#3213] `hashtags`: altered `name` type to `text`. `hashtags_objects`: removed unused...
Ivan Tashkinov [Mon, 22 Feb 2021 20:26:07 +0000 (23:26 +0300)]
[#3213] `hashtags`: altered `name` type to `text`. `hashtags_objects`: removed unused index. HashtagsTableMigrator: records_per_second calculation fix. ActivityPub: hashtags-related options normalization.

3 years ago[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web...
Ivan Tashkinov [Mon, 22 Feb 2021 20:09:41 +0000 (23:09 +0300)]
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer).

3 years agoMerge branch 'revert/changelog' into 'develop'
feld [Sat, 20 Feb 2021 23:18:43 +0000 (23:18 +0000)]
Merge branch 'revert/changelog' into 'develop'

Revert changelog entry that leaked from another branch.

See merge request pleroma/pleroma!3334

3 years agoRevert changelog entry that leaked from another branch.
Mark Felder [Sat, 20 Feb 2021 23:07:12 +0000 (17:07 -0600)]
Revert changelog entry that leaked from another branch.

3 years agoMerge branch 'fix/filters' into 'develop'
Haelwenn [Sat, 20 Feb 2021 21:18:04 +0000 (21:18 +0000)]
Merge branch 'fix/filters' into 'develop'

Minor fixes to upload filters

See merge request pleroma/pleroma!3332

3 years agoDocument HeifToJpeg and its requirement of libheif's heic-convert tool
Mark Felder [Sat, 20 Feb 2021 20:32:14 +0000 (14:32 -0600)]
Document HeifToJpeg and its requirement of libheif's heic-convert tool

3 years agoExiftool also cannot strip from heic files.
Mark Felder [Sat, 20 Feb 2021 20:28:21 +0000 (14:28 -0600)]
Exiftool also cannot strip from heic files.

3 years agoShow a proper error. A failure doesn't always mean the command isn't available, and...
Mark Felder [Sat, 20 Feb 2021 20:26:59 +0000 (14:26 -0600)]
Show a proper error. A failure doesn't always mean the command isn't available, and we check for it on startup

3 years ago[#3213] Experimental / debug feature: `database: [improved_hashtag_timeline: :presele...
Ivan Tashkinov [Thu, 18 Feb 2021 18:03:06 +0000 (21:03 +0300)]
[#3213] Experimental / debug feature: `database: [improved_hashtag_timeline: :preselect_hashtag_ids]`.

3 years ago[#3213] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults...
Ivan Tashkinov [Thu, 18 Feb 2021 17:40:10 +0000 (20:40 +0300)]
[#3213] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.

3 years agoMerge branch 'fix/chats-no-unread-in-openapi' into 'develop'
rinpatch [Thu, 18 Feb 2021 09:54:59 +0000 (09:54 +0000)]
Merge branch 'fix/chats-no-unread-in-openapi' into 'develop'

ChatMessage schema: Add `unread` property

See merge request pleroma/pleroma!3323

3 years agoMerge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'
Haelwenn [Wed, 17 Feb 2021 22:31:11 +0000 (22:31 +0000)]
Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'

Remove `:auth, :enforce_oauth_admin_scope_usage`

See merge request pleroma/pleroma!3327

3 years agoOAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions
rinpatch [Wed, 17 Feb 2021 18:37:23 +0000 (21:37 +0300)]
OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions

Transforming scopes is no longer necessary since we are dropping
support for accessing admin api without `admin:` prefix in scopes.

3 years agoOpenAPI: Add `admin:` scope prefix to admin operations
rinpatch [Wed, 17 Feb 2021 17:56:13 +0000 (20:56 +0300)]
OpenAPI: Add `admin:` scope prefix to admin operations

Also splits "Emoji packs" to two categories: "Emoji pack administration"
and "Emoji packs"

3 years agoRemove `:auth, :enforce_oauth_admin_scope_usage`
rinpatch [Wed, 17 Feb 2021 17:47:38 +0000 (20:47 +0300)]
Remove `:auth, :enforce_oauth_admin_scope_usage`

`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.

3 years agoMerge branch 'test-docker-images' into 'develop'
rinpatch [Wed, 17 Feb 2021 17:09:24 +0000 (17:09 +0000)]
Merge branch 'test-docker-images' into 'develop'

Generate custom docker images for testing

See merge request pleroma/pleroma!3326

3 years agoDo not want these interfering with develop builds
Mark Felder [Wed, 17 Feb 2021 16:24:37 +0000 (10:24 -0600)]
Do not want these interfering with develop builds

3 years agoMake it possible to generate custom docker images by prefixing the branch name with...
Mark Felder [Wed, 17 Feb 2021 16:08:12 +0000 (10:08 -0600)]
Make it possible to generate custom docker images by prefixing the branch name with "build-docker"

3 years agoMerge branch 'chore/documentation-relicensing' into 'develop'
Haelwenn [Wed, 17 Feb 2021 15:57:11 +0000 (15:57 +0000)]
Merge branch 'chore/documentation-relicensing' into 'develop'

Relicense documentation under CC-BY-4.0

See merge request pleroma/pleroma!3322

3 years agoMerge branch 'feat/chat-list-pagination' into 'develop'
Haelwenn [Wed, 17 Feb 2021 15:36:59 +0000 (15:36 +0000)]
Merge branch 'feat/chat-list-pagination' into 'develop'

Chats: Introduce /api/v2/pleroma/chats which implements pagination

Closes #2140

See merge request pleroma/pleroma!3325

3 years agoMerge branch 'remove-conversation-api' into 'develop'
rinpatch [Wed, 17 Feb 2021 15:14:27 +0000 (15:14 +0000)]
Merge branch 'remove-conversation-api' into 'develop'

Add API endpoint to remove a conversation

Closes #2488

See merge request pleroma/pleroma!3321

3 years agoMerge branch '2510-oauth-app-tokens-further-support' into 'develop'
rinpatch [Wed, 17 Feb 2021 13:08:51 +0000 (13:08 +0000)]
Merge branch '2510-oauth-app-tokens-further-support' into 'develop'

[#2510] Improved support for app-bound OAuth tokens

Closes #2510

See merge request pleroma/pleroma!3316

3 years agoChats: Introduce /api/v2/pleroma/chats which implements pagination
rinpatch [Wed, 17 Feb 2021 12:58:33 +0000 (15:58 +0300)]
Chats: Introduce /api/v2/pleroma/chats which implements pagination

Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.

Closes #2140

3 years agoMerge branch 'update-default-avatar' into 'develop'
rinpatch [Wed, 17 Feb 2021 09:48:42 +0000 (09:48 +0000)]
Merge branch 'update-default-avatar' into 'develop'

Update the default avatar to look nicer

See merge request pleroma/pleroma!3320

3 years ago[#3213] Fixed `HashtagsTableMigrator.count/1`.
Ivan Tashkinov [Wed, 17 Feb 2021 06:23:35 +0000 (09:23 +0300)]
[#3213] Fixed `HashtagsTableMigrator.count/1`.

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Tue, 16 Feb 2021 20:23:49 +0000 (23:23 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

3 years ago[#3213] HashtagsTableMigrator state management refactoring & improvements (proper...
Ivan Tashkinov [Tue, 16 Feb 2021 20:14:15 +0000 (23:14 +0300)]
[#3213] HashtagsTableMigrator state management refactoring & improvements (proper stats serialization etc.).

3 years agoChatMessage schema: Add `unread` property
rinpatch [Tue, 16 Feb 2021 19:41:06 +0000 (22:41 +0300)]
ChatMessage schema: Add `unread` property

It is present in the code, but was not documented.

3 years agoMerge branch '2053-notifications-actor-is-active-refactoring' into 'develop'
rinpatch [Tue, 16 Feb 2021 10:11:41 +0000 (10:11 +0000)]
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

3 years agoRelicense documentation under CC-BY-4.0
rinpatch [Tue, 16 Feb 2021 10:08:08 +0000 (13:08 +0300)]
Relicense documentation under CC-BY-4.0

All contributors whose contributions were still being used
at the moment of relicensing have agreed to it.

See https://git.pleroma.social/pleroma/pleroma/-/issues/2146 .

3 years ago[#3213] Fixed `hashtags.name` lookup (must use `citext` type to do index scan). Fixed...
Ivan Tashkinov [Mon, 15 Feb 2021 18:13:14 +0000 (21:13 +0300)]
[#3213] Fixed `hashtags.name` lookup (must use `citext` type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.

3 years agoAdd API endpoint to remove a conversation
Egor Kislitsyn [Mon, 15 Feb 2021 17:48:13 +0000 (21:48 +0400)]
Add API endpoint to remove a conversation

3 years agoupdate changelog to mention change of avatar
Shpuld Shpuldson [Mon, 15 Feb 2021 13:52:36 +0000 (15:52 +0200)]
update changelog to mention change of avatar

3 years agoreplace avi.png
Shpuld Shpuldson [Mon, 15 Feb 2021 13:44:27 +0000 (15:44 +0200)]
replace avi.png

3 years agoMerge branch 'chore/mailmap' into 'develop'
rinpatch [Mon, 15 Feb 2021 10:30:29 +0000 (10:30 +0000)]
Merge branch 'chore/mailmap' into 'develop'

Add myself to .mailmap

See merge request pleroma/pleroma!3319

3 years agoAdd myself to .mailmap
rinpatch [Mon, 15 Feb 2021 10:19:44 +0000 (13:19 +0300)]
Add myself to .mailmap

I changed my email to rin@patch.cx

3 years ago[#2053] Changed `Notification/for_user_query/2` to use join to filter out inactive...
Ivan Tashkinov [Mon, 15 Feb 2021 06:08:04 +0000 (09:08 +0300)]
[#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`.

3 years ago[#3213] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvem...
Ivan Tashkinov [Sat, 13 Feb 2021 19:01:11 +0000 (22:01 +0300)]
[#3213] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).

3 years agoMerge branch 'not-used-mock' into 'develop'
rinpatch [Fri, 12 Feb 2021 08:52:04 +0000 (08:52 +0000)]
Merge branch 'not-used-mock' into 'develop'

Not used mock

See merge request pleroma/pleroma!3313

3 years agoMerge branch 'bugfix/answer-outbox' into 'develop'
rinpatch [Fri, 12 Feb 2021 08:48:51 +0000 (08:48 +0000)]
Merge branch 'bugfix/answer-outbox' into 'develop'

Add test for Answer presence into an authenticated /outbox

See merge request pleroma/pleroma!3269

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Thu, 11 Feb 2021 16:31:57 +0000 (19:31 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex

3 years ago[#3213] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_na...
Ivan Tashkinov [Thu, 11 Feb 2021 16:30:21 +0000 (19:30 +0300)]
[#3213] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.

3 years ago[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.
Ivan Tashkinov [Thu, 11 Feb 2021 12:02:50 +0000 (15:02 +0300)]
[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.

3 years agonot used mock
Alexander Strizhakov [Wed, 10 Feb 2021 15:44:49 +0000 (18:44 +0300)]
not used mock

3 years agoMerge branch 'fix/no-version-api-pleroma-social' into 'develop'
Haelwenn [Wed, 10 Feb 2021 00:52:59 +0000 (00:52 +0000)]
Merge branch 'fix/no-version-api-pleroma-social' into 'develop'

Fix no version number on api.pleroma.social

See merge request pleroma/pleroma!3310

3 years agoMerge branch 'features/ap_id-c2s-authentication' into 'develop'
rinpatch [Tue, 9 Feb 2021 19:29:43 +0000 (19:29 +0000)]
Merge branch 'features/ap_id-c2s-authentication' into 'develop'

activity_pub_controller: Add authentication to object & activity endpoints

See merge request pleroma/pleroma!3295

3 years agoOpenAPI spec: Do not show build enviroment in the spec version
rinpatch [Tue, 9 Feb 2021 19:23:11 +0000 (22:23 +0300)]
OpenAPI spec: Do not show build enviroment in the spec version

3 years agoOpenAPI spec task: Load pleroma application to get version info
rinpatch [Tue, 9 Feb 2021 19:10:09 +0000 (22:10 +0300)]
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.

3 years agoMerge branch 'new-user-emails' into 'develop'
feld [Mon, 8 Feb 2021 22:47:03 +0000 (22:47 +0000)]
Merge branch 'new-user-emails' into 'develop'

Basic new user registration email, various improvements

See merge request pleroma/pleroma!3304

3 years agoLint
Mark Felder [Mon, 8 Feb 2021 22:40:27 +0000 (16:40 -0600)]
Lint

3 years agoRevert "Add plaintext support for all emails except the digest"
Mark Felder [Mon, 8 Feb 2021 22:39:55 +0000 (16:39 -0600)]
Revert "Add plaintext support for all emails except the digest"

This reverts commit 5df9f68392f65a5688867b9bad4bda766e492923.

3 years agoMerge branch 'develop' into 'new-user-emails'
feld [Mon, 8 Feb 2021 22:01:32 +0000 (22:01 +0000)]
Merge branch 'develop' into 'new-user-emails'

3 years agoMerge branch 'feat/mrf-noemptypolicy' into 'develop'
Haelwenn [Mon, 8 Feb 2021 21:49:20 +0000 (21:49 +0000)]
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

3 years agoMRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
Mark Felder [Mon, 8 Feb 2021 21:32:47 +0000 (15:32 -0600)]
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.

Helps prevent accidental button mashes from submitting incomplete posts

3 years agoMerge branch 'fix/rss-link' into 'develop'
rinpatch [Mon, 8 Feb 2021 20:14:53 +0000 (20:14 +0000)]
Merge branch 'fix/rss-link' into 'develop'

RSS: Make sure post URL is the first `<link>` element

See merge request pleroma/pleroma!3308

3 years agoRSS: Make sure post URL is the first `<link>` element
rinpatch [Mon, 8 Feb 2021 19:41:35 +0000 (22:41 +0300)]
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.

3 years agoMerge branch 'chore/descriptions-improvements' into 'develop'
rinpatch [Mon, 8 Feb 2021 19:21:01 +0000 (19:21 +0000)]
Merge branch 'chore/descriptions-improvements' into 'develop'

More descriptions improvements

See merge request pleroma/pleroma!3307

3 years agoactivity_pub_controller: Add authentication to object & activity endpoints
Haelwenn (lanodan) Monnier [Thu, 21 Jan 2021 16:45:42 +0000 (17:45 +0100)]
activity_pub_controller: Add authentication to object & activity endpoints

3 years agoImprove various descriptions and labels
Mark Felder [Mon, 8 Feb 2021 17:45:50 +0000 (11:45 -0600)]
Improve various descriptions and labels

3 years agoMake the suggestion match the default value
Mark Felder [Mon, 8 Feb 2021 17:25:32 +0000 (11:25 -0600)]
Make the suggestion match the default value

3 years agoMerge branch 'docs/improve-mailer-settings-desc' into 'develop'
feld [Mon, 8 Feb 2021 16:49:15 +0000 (16:49 +0000)]
Merge branch 'docs/improve-mailer-settings-desc' into 'develop'

Improve Mailer descriptions for AdminFE

See merge request pleroma/pleroma!3306

3 years agoMerge branch 'develop' into 'docs/improve-mailer-settings-desc'
feld [Mon, 8 Feb 2021 16:43:04 +0000 (16:43 +0000)]
Merge branch 'develop' into 'docs/improve-mailer-settings-desc'

# Conflicts:
#   CHANGELOG.md

3 years agoImproved Mailer descriptions
Mark Felder [Sat, 6 Feb 2021 19:20:58 +0000 (13:20 -0600)]
Improved Mailer descriptions

3 years agoMerge branch 'fix/reports-from-admins' into 'develop'
rinpatch [Mon, 8 Feb 2021 10:31:20 +0000 (10:31 +0000)]
Merge branch 'fix/reports-from-admins' into 'develop'

Suppress report notification for admin actors

See merge request pleroma/pleroma!3301

3 years ago[#3213] Partially addressed code review points.
Ivan Tashkinov [Sun, 7 Feb 2021 19:24:12 +0000 (22:24 +0300)]
[#3213] Partially addressed code review points.
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).

3 years agoAlpha-sort adapters
Mark Felder [Sat, 6 Feb 2021 19:18:48 +0000 (13:18 -0600)]
Alpha-sort adapters
Add various labels, descriptions and suggestions for all adapter settings and try to use
the same terminology by the service provider.

3 years agoMove Enabled to top as it's the master control of all email. Description not really...
Mark Felder [Sat, 6 Feb 2021 18:34:32 +0000 (12:34 -0600)]
Move Enabled to top as it's the master control of all email. Description not really needed.

3 years agoMore description improvements
Mark Felder [Sat, 6 Feb 2021 18:28:49 +0000 (12:28 -0600)]
More description improvements

3 years agoUpdate SMTP error description and default value
Mark Felder [Sat, 6 Feb 2021 18:06:47 +0000 (12:06 -0600)]
Update SMTP error description and default value

3 years agoUpdate Swoosh docs URL, lint
Mark Felder [Sat, 6 Feb 2021 18:04:28 +0000 (12:04 -0600)]
Update Swoosh docs URL, lint

3 years agoThere is no reason to expose these Local adapter settings either.
Mark Felder [Sat, 6 Feb 2021 18:01:11 +0000 (12:01 -0600)]
There is no reason to expose these Local adapter settings either.

3 years agoRemove No MX lookups setting
Mark Felder [Sat, 6 Feb 2021 17:55:25 +0000 (11:55 -0600)]
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.

3 years agoImprove SMTP adapter setting descriptions
Mark Felder [Sat, 6 Feb 2021 17:55:01 +0000 (11:55 -0600)]
Improve SMTP adapter setting descriptions

3 years agoNo reason to suggest users try the useless "Local" mail adapter
Mark Felder [Sat, 6 Feb 2021 17:28:55 +0000 (11:28 -0600)]
No reason to suggest users try the useless "Local" mail adapter

3 years agoMerge branch 'feat/allow_alt_text_search_config' into 'develop'
rinpatch [Sat, 6 Feb 2021 09:42:20 +0000 (09:42 +0000)]
Merge branch 'feat/allow_alt_text_search_config' into 'develop'

allow user defined text search config in database

See merge request pleroma/pleroma!3275

3 years agoUpdate priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo...
hyperion [Sat, 6 Feb 2021 09:42:17 +0000 (09:42 +0000)]
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

3 years agoMerge branch 'varnish-large-files' into 'develop'
feld [Fri, 5 Feb 2021 19:46:53 +0000 (19:46 +0000)]
Merge branch 'varnish-large-files' into 'develop'

Improve Varnish VCL

See merge request pleroma/pleroma!3305

3 years agoAdd a default rule to not attempt to cache any files larger than 50MB
Mark Felder [Fri, 5 Feb 2021 19:32:21 +0000 (13:32 -0600)]
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.

3 years agoSlightly better formatting
Mark Felder [Fri, 5 Feb 2021 15:13:53 +0000 (09:13 -0600)]
Slightly better formatting

3 years agoAdd plaintext support for all emails except the digest
Mark Felder [Fri, 5 Feb 2021 15:13:17 +0000 (09:13 -0600)]
Add plaintext support for all emails except the digest

3 years agoLint
Mark Felder [Fri, 5 Feb 2021 15:00:17 +0000 (09:00 -0600)]
Lint

3 years agoAdd basic test to validate the registration email is dispatched when the others are...
Mark Felder [Thu, 4 Feb 2021 23:56:46 +0000 (17:56 -0600)]
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.

3 years agoActually send the mail
Mark Felder [Thu, 4 Feb 2021 23:42:09 +0000 (17:42 -0600)]
Actually send the mail

3 years agoAdded: New user registration mail
Mark Felder [Thu, 4 Feb 2021 22:14:37 +0000 (16:14 -0600)]
Added: New user registration mail

3 years agoAdd a registration email that only sends if no other emails (welcome, approval, confi...
Mark Felder [Thu, 4 Feb 2021 21:16:50 +0000 (15:16 -0600)]
Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabled

3 years agoImprove confirmation email language
Mark Felder [Thu, 4 Feb 2021 21:10:43 +0000 (15:10 -0600)]
Improve confirmation email language

3 years agoAlso make this maybe_ for consistency
Mark Felder [Thu, 4 Feb 2021 20:33:49 +0000 (14:33 -0600)]
Also make this maybe_ for consistency

3 years agoThese welcome emails are not guaranteed and can be private functions
Mark Felder [Thu, 4 Feb 2021 20:01:15 +0000 (14:01 -0600)]
These welcome emails are not guaranteed and can be private functions

3 years agoMerge branch 'develop' into fix/reports-from-admins
Mark Felder [Thu, 4 Feb 2021 18:37:20 +0000 (12:37 -0600)]
Merge branch 'develop' into fix/reports-from-admins

3 years agoMerge branch 'chore/fix-mix-env' into 'develop'
feld [Thu, 4 Feb 2021 16:27:05 +0000 (16:27 +0000)]
Merge branch 'chore/fix-mix-env' into 'develop'

Standardize the way we capture and use Mix.env()

See merge request pleroma/pleroma!3303

3 years agoStandardize the way we capture and use Mix.env()
Mark Felder [Thu, 4 Feb 2021 16:11:48 +0000 (10:11 -0600)]
Standardize the way we capture and use Mix.env()

3 years agoMerge branch 'fix/configdb-error' into 'develop'
feld [Thu, 4 Feb 2021 14:33:59 +0000 (14:33 +0000)]
Merge branch 'fix/configdb-error' into 'develop'

Improve error message for ConfigDB

See merge request pleroma/pleroma!3289

3 years agoMerge branch 'bugfix/notice-external-redirect' into 'develop'
Haelwenn [Thu, 4 Feb 2021 14:26:03 +0000 (14:26 +0000)]
Merge branch 'bugfix/notice-external-redirect' into 'develop'

Redirect non-local activities when /notice/:id is used

See merge request pleroma/pleroma!3300

3 years agoRedirect non-local activities when /notice/:id is used
Haelwenn (lanodan) Monnier [Wed, 3 Feb 2021 16:53:09 +0000 (17:53 +0100)]
Redirect non-local activities when /notice/:id is used

Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
3 years agoMerge branch 'chore/external-emoji-example' into 'develop'
Haelwenn [Thu, 4 Feb 2021 14:05:30 +0000 (14:05 +0000)]
Merge branch 'chore/external-emoji-example' into 'develop'

Stop external emoji example from leaking

See merge request pleroma/pleroma!3302

3 years agoLoad an emoji.txt specific to the test env
Mark Felder [Wed, 3 Feb 2021 22:36:45 +0000 (16:36 -0600)]
Load an emoji.txt specific to the test env