akkoma
3 years agoRemove sensitive-property setting #nsfw, create HashtagPolicy
Haelwenn (lanodan) Monnier [Mon, 28 Dec 2020 22:21:53 +0000 (23:21 +0100)]
Remove sensitive-property setting #nsfw, create HashtagPolicy

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

3 years agoDocument admin actors not getting report notifications
Mark Felder [Wed, 3 Feb 2021 20:52:49 +0000 (14:52 -0600)]
Document admin actors not getting report notifications

3 years agoValidate admin making report doesn't get their own report notification, but other...
Mark Felder [Wed, 3 Feb 2021 18:54:53 +0000 (12:54 -0600)]
Validate admin making report doesn't get their own report notification, but other admins do

3 years agoExclude reporter from receiving notifications from their own reports.
Mark Felder [Wed, 3 Feb 2021 18:32:44 +0000 (12:32 -0600)]
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.

3 years agoMerge branch 'fix/openapi-relationship-nullable' into 'develop'
rinpatch [Wed, 3 Feb 2021 15:14:40 +0000 (15:14 +0000)]
Merge branch 'fix/openapi-relationship-nullable' into 'develop'

Account schema: specify that pleroma.relationship is nullable

See merge request pleroma/pleroma!3299

3 years agoAccount schema: specify that pleroma.relationship is nullable
rinpatch [Wed, 3 Feb 2021 15:10:43 +0000 (18:10 +0300)]
Account schema: specify that pleroma.relationship is nullable

3 years agoMerge branch 'fix/deploy-api-docs-2-electric-boogalo' into 'develop'
rinpatch [Wed, 3 Feb 2021 15:01:08 +0000 (15:01 +0000)]
Merge branch 'fix/deploy-api-docs-2-electric-boogalo' into 'develop'

CI: Forgot $ in spec-deploy

See merge request pleroma/pleroma!3298

3 years agoCI: Forgot $ in spec-deploy
rinpatch [Wed, 3 Feb 2021 15:00:04 +0000 (18:00 +0300)]
CI: Forgot $ in spec-deploy

3 years agoMerge branch 'fix/2412-filters' into 'develop'
feld [Wed, 3 Feb 2021 14:36:35 +0000 (14:36 +0000)]
Merge branch 'fix/2412-filters' into 'develop'

Support for expires_in/expires_at in filters

Closes #2412

See merge request pleroma/pleroma!3279

3 years agoMerge branch 'develop' into 'fix/2412-filters'
feld [Wed, 3 Feb 2021 14:23:23 +0000 (14:23 +0000)]
Merge branch 'develop' into 'fix/2412-filters'

# Conflicts:
#   CHANGELOG.md

3 years agoMerge branch 'fix/2449-scheduled-poll-bug' into 'develop'
feld [Wed, 3 Feb 2021 14:22:23 +0000 (14:22 +0000)]
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'

Fix for scheduled post with poll

Closes #2449

See merge request pleroma/pleroma!3294

3 years agoMerge branch 'feature/2438-users-posts-total-count' into 'develop'
feld [Wed, 3 Feb 2021 14:21:57 +0000 (14:21 +0000)]
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

3 years agoMerge branch 'fix/deploy-api-docs' into 'develop'
rinpatch [Wed, 3 Feb 2021 14:03:24 +0000 (14:03 +0000)]
Merge branch 'fix/deploy-api-docs' into 'develop'

CI: Add job ref when calling api docs builder

See merge request pleroma/pleroma!3297

3 years agoCI: Add job ref when calling api docs builder
rinpatch [Wed, 3 Feb 2021 14:02:01 +0000 (17:02 +0300)]
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

3 years agoMerge branch 'feat/openapi-spec-export' into 'develop'
rinpatch [Wed, 3 Feb 2021 13:21:19 +0000 (13:21 +0000)]
Merge branch 'feat/openapi-spec-export' into 'develop'

Improve OpenAPI spec and deploy it to api.pleroma.social

See merge request pleroma/pleroma!3296

3 years agoImprove OpenAPI spec and deploy it to api.pleroma.social
rinpatch [Wed, 3 Feb 2021 12:38:59 +0000 (15:38 +0300)]
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.

3 years agoAdd test for Answer presence into an authenticated /outbox
Haelwenn (lanodan) Monnier [Thu, 21 Jan 2021 16:09:18 +0000 (17:09 +0100)]
Add test for Answer presence into an authenticated /outbox

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Wed, 3 Feb 2021 06:31:38 +0000 (09:31 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex

3 years agoMerge branch 'a1batross-develop-patch-62810' into 'develop'
feld [Tue, 2 Feb 2021 18:37:20 +0000 (18:37 +0000)]
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

3 years agoMerge branch 'email-stub-in-verify-credentials' into 'develop'
feld [Tue, 2 Feb 2021 18:35:08 +0000 (18:35 +0000)]
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

3 years agoMerge branch 'develop' into a1batross-develop-patch-62810
Mark Felder [Tue, 2 Feb 2021 18:18:03 +0000 (12:18 -0600)]
Merge branch 'develop' into a1batross-develop-patch-62810

3 years agoMerge branch 'develop' into a1batross-develop-patch-62810
Mark Felder [Tue, 2 Feb 2021 18:16:49 +0000 (12:16 -0600)]
Merge branch 'develop' into a1batross-develop-patch-62810

3 years agoMix pleroma.instance creates parent directories now
Mark Felder [Tue, 2 Feb 2021 18:16:01 +0000 (12:16 -0600)]
Mix pleroma.instance creates parent directories now

3 years agoMerge branch 'fix/majic-nits' into 'develop'
feld [Tue, 2 Feb 2021 18:15:00 +0000 (18:15 +0000)]
Merge branch 'fix/majic-nits' into 'develop'

Majic: don't fix extensions

See merge request pleroma/pleroma!3287

3 years agoDocument OAuth 2.0 provider fqn field addition
Mark Felder [Tue, 2 Feb 2021 18:12:37 +0000 (12:12 -0600)]
Document OAuth 2.0 provider fqn field addition

3 years agoMerge branch 'fix/2411-mutes-api' into 'develop'
feld [Tue, 2 Feb 2021 18:08:46 +0000 (18:08 +0000)]
Merge branch 'fix/2411-mutes-api' into 'develop'

Support for with_relationships parameter

Closes #2411

See merge request pleroma/pleroma!3290

3 years agoDocument we are disabling the extension fixup in Majic
Mark Felder [Tue, 2 Feb 2021 18:03:20 +0000 (12:03 -0600)]
Document we are disabling the extension fixup in Majic

3 years agoMerge branch 'develop' into fix/majic-nits
Mark Felder [Tue, 2 Feb 2021 18:01:48 +0000 (12:01 -0600)]
Merge branch 'develop' into fix/majic-nits

3 years agoMerge branch 'develop' into 'fix/2411-mutes-api'
feld [Tue, 2 Feb 2021 17:57:58 +0000 (17:57 +0000)]
Merge branch 'develop' into 'fix/2411-mutes-api'

# Conflicts:
#   CHANGELOG.md
#   docs/development/API/differences_in_mastoapi_responses.md

3 years agoMerge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'
feld [Tue, 2 Feb 2021 17:22:23 +0000 (17:22 +0000)]
Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'

fix and delete purge activities duplicates

Closes #2473

See merge request pleroma/pleroma!3285

3 years agoMerge branch 'feature/2164-unify-api-arguments' into 'develop'
feld [Tue, 2 Feb 2021 17:18:07 +0000 (17:18 +0000)]
Merge branch 'feature/2164-unify-api-arguments' into 'develop'

Unifying timelines api arguments

Closes #2164

See merge request pleroma/pleroma!3281

3 years agoImprove changelog description
Mark Felder [Tue, 2 Feb 2021 17:15:47 +0000 (11:15 -0600)]
Improve changelog description