akkoma
3 years agoMerge branch 'feat/client_app_details' into 'develop'
lain [Sun, 28 Feb 2021 16:17:34 +0000 (16:17 +0000)]
Merge branch 'feat/client_app_details' into 'develop'

Support application field

See merge request pleroma/pleroma!3311

3 years agoSimplify migration
Mark Felder [Sun, 28 Feb 2021 15:04:29 +0000 (09:04 -0600)]
Simplify migration

3 years agoMerge branch 'frontendstatic-ignore-api-calls' into 'develop'
lain [Sat, 27 Feb 2021 19:40:38 +0000 (19:40 +0000)]
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'

Filter out API calls from FrontendStatic plug

Closes #2261

See merge request pleroma/pleroma!3346

3 years agoMerge branch 'fix/repo-terminate' into 'develop'
lain [Sat, 27 Feb 2021 19:37:08 +0000 (19:37 +0000)]
Merge branch 'fix/repo-terminate' into 'develop'

don't use continue in Stats init for test env

See merge request pleroma/pleroma!3349

3 years agodon't use continue in Stats init for test env
Alexander Strizhakov [Sat, 27 Feb 2021 06:39:15 +0000 (09:39 +0300)]
don't use continue in Stats init for test env

3 years agoStore the client application data in ActivityStreams format
Mark Felder [Sat, 27 Feb 2021 00:14:57 +0000 (18:14 -0600)]
Store the client application data in ActivityStreams format

3 years agoMerge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'
feld [Fri, 26 Feb 2021 16:49:11 +0000 (16:49 +0000)]
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'

expires_in in scheduled status params

Closes #2498

See merge request pleroma/pleroma!3315

3 years agoMerge branch 'ecto-rollback-in-test-env' into 'develop'
feld [Fri, 26 Feb 2021 16:47:53 +0000 (16:47 +0000)]
Merge branch 'ecto-rollback-in-test-env' into 'develop'

Possibility to run rollback in test env

See merge request pleroma/pleroma!3212

3 years agoMerge branch 'PestToast-develop-patch-66930' into 'develop'
rinpatch [Fri, 26 Feb 2021 09:21:15 +0000 (09:21 +0000)]
Merge branch 'PestToast-develop-patch-66930' into 'develop'

Removed a command that references "pleroma.env". This file does not seem to be...

See merge request pleroma/pleroma!3347

3 years agoRemoved a command that references "pleroma.env". This file does not seem to be genera...
PestToast [Fri, 26 Feb 2021 01:01:29 +0000 (01:01 +0000)]
Removed a command that references "pleroma.env". This file does not seem to be generated at any point during the install, and not having it does not stop the instance from working, as far as I can tell.

3 years agoNote our upgrade path for this functionality
Mark Felder [Thu, 25 Feb 2021 19:08:36 +0000 (13:08 -0600)]
Note our upgrade path for this functionality

3 years agoLeave a note for future explorers
Mark Felder [Thu, 25 Feb 2021 19:06:43 +0000 (13:06 -0600)]
Leave a note for future explorers

3 years agoNo need to filter out Mix.env() from the API routes.
Mark Felder [Thu, 25 Feb 2021 19:04:08 +0000 (13:04 -0600)]
No need to filter out Mix.env() from the API routes.

3 years agoImproved recursion through the api route list
Mark Felder [Thu, 25 Feb 2021 16:07:29 +0000 (10:07 -0600)]
Improved recursion through the api route list

3 years agoFilter out MIX_ENV from route list and add a test
Mark Felder [Thu, 25 Feb 2021 15:23:10 +0000 (09:23 -0600)]
Filter out MIX_ENV from route list and add a test

3 years agoEnum instead of Stream
Mark Felder [Thu, 25 Feb 2021 15:06:56 +0000 (09:06 -0600)]
Enum instead of Stream

3 years agoAttempt to filter out API calls from FrontendStatic plug
Mark Felder [Wed, 24 Feb 2021 21:23:45 +0000 (15:23 -0600)]
Attempt to filter out API calls from FrontendStatic plug

3 years agoMerge branch 'gitignore' into 'develop'
Haelwenn [Wed, 24 Feb 2021 18:32:55 +0000 (18:32 +0000)]
Merge branch 'gitignore' into 'develop'

gitignore: Vi and emacs temp files

See merge request pleroma/pleroma!3345

3 years agoVi and emacs temp files
Mark Felder [Wed, 24 Feb 2021 18:11:50 +0000 (12:11 -0600)]
Vi and emacs temp files

3 years agoMerge branch 'docfix/chat-token' into 'develop'
Haelwenn [Wed, 24 Feb 2021 17:26:26 +0000 (17:26 +0000)]
Merge branch 'docfix/chat-token' into 'develop'

Update terminology in differences_in_mastoapi_responses.md

See merge request pleroma/pleroma!3344

3 years agoUpdate terminology in differences_in_mastoapi_responses.md
zonk [Wed, 24 Feb 2021 14:23:56 +0000 (14:23 +0000)]
Update terminology in differences_in_mastoapi_responses.md

3 years agoMerge branch 'fix/whalebird-url' into 'develop'
feld [Tue, 23 Feb 2021 14:17:06 +0000 (14:17 +0000)]
Merge branch 'fix/whalebird-url' into 'develop'

Fix URL of Whalebird in docs

See merge request pleroma/pleroma!3339

3 years agoMerge branch 'chore/no-activitypub-sleeps' into 'develop'
lain [Tue, 23 Feb 2021 13:53:59 +0000 (13:53 +0000)]
Merge branch 'chore/no-activitypub-sleeps' into 'develop'

Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote

See merge request pleroma/pleroma!3330

3 years agoFix URL of Whalebird in docs
AkiraFukushima [Tue, 23 Feb 2021 12:31:06 +0000 (21:31 +0900)]
Fix URL of Whalebird in docs

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 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 agoAvoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
Mark Felder [Sat, 20 Feb 2021 00:37:37 +0000 (18:37 -0600)]
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote

3 years agoPermit :disclose_client in changesets
Mark Felder [Thu, 18 Feb 2021 23:50:46 +0000 (17:50 -0600)]
Permit :disclose_client in changesets

3 years agoTests to validate client disclosure obeys user setting
Mark Felder [Thu, 18 Feb 2021 23:23:17 +0000 (17:23 -0600)]
Tests to validate client disclosure obeys user setting

3 years agoAdd field to user schema for controlling disclosure of client details
Mark Felder [Thu, 18 Feb 2021 22:43:41 +0000 (16:43 -0600)]
Add field to user schema for controlling disclosure of client details

3 years agoMastodon makes this field null when posting with MastoFE or if you choose to not...
Mark Felder [Thu, 18 Feb 2021 22:35:03 +0000 (16:35 -0600)]
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default

3 years agoexpires_in in scheduled status params
Alexander Strizhakov [Thu, 11 Feb 2021 10:01:48 +0000 (13:01 +0300)]
expires_in in scheduled status params

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 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 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 agoAdditional validation so we don't get caught off guard with a nil response
Mark Felder [Fri, 12 Feb 2021 19:15:33 +0000 (13:15 -0600)]
Additional validation so we don't get caught off guard with a nil response
if CommonAPI ever prevents us from injecting this data

3 years agoInject fake application metadata and validate it is stripped by transmogrifier
Mark Felder [Fri, 12 Feb 2021 19:05:12 +0000 (13:05 -0600)]
Inject fake application metadata and validate it is stripped by transmogrifier

3 years agoApp is already preloaded into the token, so avoid an extra query
Mark Felder [Fri, 12 Feb 2021 18:44:45 +0000 (12:44 -0600)]
App is already preloaded into the token, so avoid an extra query

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 agoUse a custom oauth token so we can predict and validate the client_name and website
Mark Felder [Thu, 11 Feb 2021 21:53:10 +0000 (15:53 -0600)]
Use a custom oauth token so we can predict and validate the client_name and website

3 years agoDocument the application metadata is now retained as part of the post.
Mark Felder [Thu, 11 Feb 2021 21:10:53 +0000 (15:10 -0600)]
Document the application metadata is now retained as part of the post.

3 years agoValidate client application metadata is retained in the object
Mark Felder [Thu, 11 Feb 2021 21:07:21 +0000 (15:07 -0600)]
Validate client application metadata is retained in the object

3 years agoConsistency
Mark Felder [Thu, 11 Feb 2021 20:27:52 +0000 (14:27 -0600)]
Consistency

3 years agoRevert to original formatting for these function defs
Mark Felder [Thu, 11 Feb 2021 20:22:58 +0000 (14:22 -0600)]
Revert to original formatting for these function defs

3 years agoPrefer naming this put_application because we're putting it into the params map
Mark Felder [Thu, 11 Feb 2021 20:19:53 +0000 (14:19 -0600)]
Prefer naming this put_application because we're putting it into the params map

3 years ago%Token{} may not be in the conn, so avoid breaking the ability to post statuses in...
Mark Felder [Thu, 11 Feb 2021 20:15:25 +0000 (14:15 -0600)]
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.

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 agoRendering fallback for when we don't have valid data available
Mark Felder [Wed, 10 Feb 2021 00:51:59 +0000 (18:51 -0600)]
Rendering fallback for when we don't have valid data available

3 years agoEnable rendering of the client application data details
Mark Felder [Wed, 10 Feb 2021 00:19:20 +0000 (18:19 -0600)]
Enable rendering of the client application data details

3 years agoEnsure we capture the application details into the object
Mark Felder [Wed, 10 Feb 2021 00:07:15 +0000 (18:07 -0600)]
Ensure we capture the application details into the object

3 years agoAdd a function to lookup client app details by the app_id
Mark Felder [Tue, 9 Feb 2021 20:41:58 +0000 (14:41 -0600)]
Add a function to lookup client app details by the app_id

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 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.