akkoma
2 years agoMerge remote-tracking branch 'origin/develop' into password-reset
Alex Gleason [Fri, 3 Dec 2021 06:11:38 +0000 (00:11 -0600)]
Merge remote-tracking branch 'origin/develop' into password-reset

2 years agoRestore POST /auth/password
Alex Gleason [Fri, 3 Dec 2021 06:02:49 +0000 (00:02 -0600)]
Restore POST /auth/password

2 years agoMerge branch 'fix/2782-nodeinfo-active-users' into 'develop'
lain [Thu, 2 Dec 2021 16:54:28 +0000 (16:54 +0000)]
Merge branch 'fix/2782-nodeinfo-active-users' into 'develop'

nodeinfo: report activeMonth and activeHalfyear users fields

Closes #2782

See merge request pleroma/pleroma!3536

2 years agoMerge branch 'update-hackney' into 'develop'
lain [Wed, 1 Dec 2021 15:49:57 +0000 (15:49 +0000)]
Merge branch 'update-hackney' into 'develop'

Mix: upgrade Hackney to 1.18.0

Closes #2753

See merge request pleroma/pleroma!3549

2 years agoMerge branch 'force_pinned_objects_to_be_empty' into 'develop'
lain [Mon, 29 Nov 2021 18:08:10 +0000 (18:08 +0000)]
Merge branch 'force_pinned_objects_to_be_empty' into 'develop'

Force pinned_objects to be empty, not null

Closes #2788

See merge request pleroma/pleroma!3548

2 years agoForce pinned_objects to be empty, not null
NEETzsche [Mon, 29 Nov 2021 18:08:09 +0000 (18:08 +0000)]
Force pinned_objects to be empty, not null

2 years agoMix: upgrade Hackney to 1.18.0
a1batross [Mon, 29 Nov 2021 17:28:10 +0000 (17:28 +0000)]
Mix: upgrade Hackney to 1.18.0

3 years agoAdd changelog entry
Alibek Omarov [Tue, 16 Nov 2021 23:39:10 +0000 (00:39 +0100)]
Add changelog entry

3 years agoMerge branch 'bugfix/markdown-newlines' into 'develop'
Haelwenn [Tue, 16 Nov 2021 13:54:34 +0000 (13:54 +0000)]
Merge branch 'bugfix/markdown-newlines' into 'develop'

mix: Update earmark

See merge request pleroma/pleroma!3538

3 years agomix: Update earmark
Haelwenn (lanodan) Monnier [Tue, 16 Nov 2021 13:32:49 +0000 (14:32 +0100)]
mix: Update earmark

This should fix the presence of extraneous newlines in markdown output.

Related: https://github.com/pragdave/earmark/issues/406

3 years agoMerge branch 'update-elixir' into 'develop'
lain [Mon, 15 Nov 2021 20:17:38 +0000 (20:17 +0000)]
Merge branch 'update-elixir' into 'develop'

CI: Upload the image for all platforms

See merge request pleroma/pleroma!3537

3 years agoCI: Upload the image for all platforms
Lain Soykaf [Mon, 15 Nov 2021 20:04:43 +0000 (21:04 +0100)]
CI: Upload the image for all platforms

For some reason the other platforms started failing, too. This
fixes it. Why? Don't know.

3 years agonodeinfo: report activeMonth and activeHalfyear users fields
Alibek Omarov [Mon, 15 Nov 2021 15:58:25 +0000 (16:58 +0100)]
nodeinfo: report activeMonth and activeHalfyear users fields

3 years agoMerge branch 'fix-tests' into 'develop'
lain [Mon, 15 Nov 2021 14:31:27 +0000 (14:31 +0000)]
Merge branch 'fix-tests' into 'develop'

Test fixes

See merge request pleroma/pleroma!3532

3 years agoMerge branch 'block-behavior' into 'develop'
lain [Mon, 15 Nov 2021 14:27:59 +0000 (14:27 +0000)]
Merge branch 'block-behavior' into 'develop'

Configurable block visibility, fixes #2123

Closes #2123

See merge request pleroma/pleroma!3242

3 years agoMerge branch 'instance-deletion' into 'develop'
lain [Mon, 15 Nov 2021 14:24:13 +0000 (14:24 +0000)]
Merge branch 'instance-deletion' into 'develop'

AdminAPI: endpoint to delete all content from a remote instance

See merge request pleroma/pleroma!3483

3 years agoMerge branch 'fix-object-deletion-timeout' into 'develop'
lain [Mon, 15 Nov 2021 13:21:42 +0000 (13:21 +0000)]
Merge branch 'fix-object-deletion-timeout' into 'develop'

Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted

Closes #2704

See merge request pleroma/pleroma!3479

3 years agoMerge branch 'bump/http_signatures-0.1.1' into 'develop'
lain [Mon, 15 Nov 2021 11:58:49 +0000 (11:58 +0000)]
Merge branch 'bump/http_signatures-0.1.1' into 'develop'

mix: Update http_signatures to 0.1.1

See merge request pleroma/pleroma!3530

3 years agoMerge branch 'userfeed-fe-fallback' into 'develop'
lain [Mon, 15 Nov 2021 10:48:56 +0000 (10:48 +0000)]
Merge branch 'userfeed-fe-fallback' into 'develop'

UserController: fall back to frontend when user isn't found

Closes #2730

See merge request pleroma/pleroma!3515

3 years agoMerge branch 'fix-releases' into 'develop'
lain [Sun, 14 Nov 2021 20:35:10 +0000 (20:35 +0000)]
Merge branch 'fix-releases' into 'develop'

CI: Conservatively update release images so they keep building.

See merge request pleroma/pleroma!3534

3 years agoCI: Conservatively update release images so they keep building.
Lain Soykaf [Sun, 14 Nov 2021 19:37:32 +0000 (20:37 +0100)]
CI: Conservatively update release images so they keep building.

3 years agoMerge branch 'bugfix/inbox-misleading-warning' into 'develop'
lain [Sun, 14 Nov 2021 16:14:09 +0000 (16:14 +0000)]
Merge branch 'bugfix/inbox-misleading-warning' into 'develop'

activity_pub_controller: Fix misleading debug warning in post_inbox_fallback

See merge request pleroma/pleroma!3531

3 years agoMerge branch 'update-crypt' into 'develop'
lain [Sun, 14 Nov 2021 16:00:01 +0000 (16:00 +0000)]
Merge branch 'update-crypt' into 'develop'

Mix: Update crypt to fix musl builds.

See merge request pleroma/pleroma!3533

3 years agoMix: Update crypt to fix musl builds.
Lain Soykaf [Sun, 14 Nov 2021 15:04:08 +0000 (16:04 +0100)]
Mix: Update crypt to fix musl builds.

3 years agoMediaProxyCacheControllerTest: Fix unstable tests.
Lain Soykaf [Sun, 14 Nov 2021 10:45:38 +0000 (11:45 +0100)]
MediaProxyCacheControllerTest: Fix unstable tests.

Cachex order isn't stable, so we can not depend on the order in
tests. This adds some sorting to make the tests stable.

3 years agoStealEmojiPolicyTest: Make mocks explicit.
Lain Soykaf [Sun, 14 Nov 2021 10:44:24 +0000 (11:44 +0100)]
StealEmojiPolicyTest: Make mocks explicit.

3 years agoMix: Upgrade mogrify library
Lain Soykaf [Sun, 14 Nov 2021 10:43:39 +0000 (11:43 +0100)]
Mix: Upgrade mogrify library

The old library would modify a file on reading it, the new one
doesn't have this issue.

3 years agoactivity_pub_controller: Fix misleading debug warning in post_inbox_fallback
Haelwenn (lanodan) Monnier [Tue, 9 Nov 2021 23:37:27 +0000 (00:37 +0100)]
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback

3 years agomix: Update http_signatures to 0.1.1
Haelwenn (lanodan) Monnier [Tue, 9 Nov 2021 23:53:32 +0000 (00:53 +0100)]
mix: Update http_signatures to 0.1.1

3 years agoMerge branch 'refactor/group_validator_fields' into 'develop'
Haelwenn [Sun, 10 Oct 2021 08:57:11 +0000 (08:57 +0000)]
Merge branch 'refactor/group_validator_fields' into 'develop'

object_validators: Group common fields in CommonValidations

See merge request pleroma/pleroma!3384

3 years agoobject_validators: Group common fields in CommonValidations
Haelwenn (lanodan) Monnier [Thu, 1 Apr 2021 11:26:32 +0000 (13:26 +0200)]
object_validators: Group common fields in CommonValidations

Notes:
- QuestionValidator didn't have a :name field but that seems like a mistake
- `_fields` functions can't inherit others because of some Validators
- bto/bcc fields were absent in activities, also seems like a mistake
  (Well IIRC we don't or barely support bto/bcc anyway)

3 years agoMerge branch 'typo' into 'develop'
feld [Thu, 7 Oct 2021 20:02:41 +0000 (20:02 +0000)]
Merge branch 'typo' into 'develop'

Fix typo

See merge request pleroma/pleroma!3528

3 years agoFix typo
Mark Felder [Wed, 6 Oct 2021 15:49:25 +0000 (10:49 -0500)]
Fix typo

3 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
Haelwenn [Wed, 6 Oct 2021 06:26:55 +0000 (06:26 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!3513

3 years agoTranslated using Weblate (Japanese)
Ryo Ueno [Sat, 18 Sep 2021 09:24:15 +0000 (09:24 +0000)]
Translated using Weblate (Japanese)

Currently translated at 21.6% (23 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/ja/

3 years agoAdded translation using Weblate (Japanese)
Ryo Ueno [Sat, 18 Sep 2021 09:07:55 +0000 (09:07 +0000)]
Added translation using Weblate (Japanese)

3 years agoTranslated using Weblate (Vietnamese)
Hồ Nhất Duy [Mon, 6 Sep 2021 11:13:59 +0000 (11:13 +0000)]
Translated using Weblate (Vietnamese)

Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/vi/

3 years agoAdded translation using Weblate (Vietnamese)
Hồ Nhất Duy [Mon, 6 Sep 2021 11:13:18 +0000 (11:13 +0000)]
Added translation using Weblate (Vietnamese)

3 years agoTranslated using Weblate (Indonesian)
@liimee [Thu, 2 Sep 2021 06:05:32 +0000 (06:05 +0000)]
Translated using Weblate (Indonesian)

Currently translated at 64.1% (68 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/

3 years agoTranslated using Weblate (Indonesian)
@liimee [Wed, 25 Aug 2021 00:34:25 +0000 (00:34 +0000)]
Translated using Weblate (Indonesian)

Currently translated at 61.3% (65 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/

3 years agoTranslated using Weblate (Indonesian)
@liimee [Sun, 22 Aug 2021 04:40:51 +0000 (04:40 +0000)]
Translated using Weblate (Indonesian)

Currently translated at 59.4% (63 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/

3 years agoTranslated using Weblate (Indonesian)
@liimee [Thu, 19 Aug 2021 15:23:51 +0000 (15:23 +0000)]
Translated using Weblate (Indonesian)

Currently translated at 55.6% (59 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/

3 years agoTranslated using Weblate (Indonesian)
@liimee [Tue, 17 Aug 2021 14:40:55 +0000 (14:40 +0000)]
Translated using Weblate (Indonesian)

Currently translated at 50.9% (54 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/

3 years agoTranslated using Weblate (Indonesian)
@liimee [Mon, 16 Aug 2021 07:25:43 +0000 (07:25 +0000)]
Translated using Weblate (Indonesian)

Currently translated at 4.7% (5 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/

3 years agoAdded translation using Weblate (Indonesian)
@liimee [Sun, 15 Aug 2021 15:40:52 +0000 (15:40 +0000)]
Added translation using Weblate (Indonesian)

3 years agoTranslated using Weblate (Polish)
marcin mikołajczak [Sat, 14 Aug 2021 07:47:11 +0000 (07:47 +0000)]
Translated using Weblate (Polish)

Currently translated at 100.0% (104 of 104 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/

3 years agoMerge branch 'ci/bump-elixir-lint' into 'develop'
Haelwenn [Wed, 6 Oct 2021 06:12:08 +0000 (06:12 +0000)]
Merge branch 'ci/bump-elixir-lint' into 'develop'

CI: Bump lint stage to elixir-1.12

See merge request pleroma/pleroma!3488

3 years agoCI: Bump lint stage to elixir-1.12
Haelwenn (lanodan) Monnier [Wed, 6 Oct 2021 06:08:21 +0000 (08:08 +0200)]
CI: Bump lint stage to elixir-1.12

Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`

3 years agoMerge branch 'bugfix/crypt-pragma' into 'develop'
Haelwenn [Wed, 6 Oct 2021 05:58:52 +0000 (05:58 +0000)]
Merge branch 'bugfix/crypt-pragma' into 'develop'

mix: Update crypt to fix #pragma warning

Closes #2710

See merge request pleroma/pleroma!3527

3 years agoMerge branch 'from/develop/tusooa/add-remove-emails' into 'develop'
Haelwenn [Wed, 6 Oct 2021 05:44:44 +0000 (05:44 +0000)]
Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'

Allow users to remove their emails if instance does not need email to register

See merge request pleroma/pleroma!3522

3 years agoMerge branch 'partev-develop-patch-72837' into 'develop'
Haelwenn [Wed, 6 Oct 2021 05:41:06 +0000 (05:41 +0000)]
Merge branch 'partev-develop-patch-72837' into 'develop'

fix a typo "Optionnal" -> "Optional"

See merge request pleroma/pleroma!3525

3 years agomix: Update crypt to fix #pragma warning
Haelwenn (lanodan) Monnier [Mon, 20 Sep 2021 23:16:14 +0000 (01:16 +0200)]
mix: Update crypt to fix #pragma warning

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2710
3 years agoMerge branch 'dockerfix' into 'develop'
Haelwenn [Tue, 21 Sep 2021 22:04:59 +0000 (22:04 +0000)]
Merge branch 'dockerfix' into 'develop'

Docker fix

See merge request pleroma/pleroma!3526

3 years agoUpdate to newer buildx as current one can't be downloaded due to some Github error
Mark Felder [Mon, 20 Sep 2021 21:58:25 +0000 (16:58 -0500)]
Update to newer buildx as current one can't be downloaded due to some Github error

3 years agofix a typo "Optionnal" -> "Optional"
partev [Sun, 12 Sep 2021 15:31:49 +0000 (15:31 +0000)]
fix a typo "Optionnal" -> "Optional"

3 years agoMerge branch 'remove/mastofe' into 'develop'
Haelwenn [Tue, 7 Sep 2021 16:41:53 +0000 (16:41 +0000)]
Merge branch 'remove/mastofe' into 'develop'

Remove MastoFE from Pleroma, fixes #2625

Closes #2625

See merge request pleroma/pleroma!3392

3 years agoAllow users to remove their emails if instance does not need email to register
Tusooa Zhu [Mon, 6 Sep 2021 00:56:16 +0000 (20:56 -0400)]
Allow users to remove their emails if instance does not need email to register

3 years agoMerge branch 'small-cleanup' into 'develop'
Haelwenn [Wed, 1 Sep 2021 21:52:56 +0000 (21:52 +0000)]
Merge branch 'small-cleanup' into 'develop'

Remove unused Logger

See merge request pleroma/pleroma!3521

3 years agoRemove unused Logger
Mark Felder [Wed, 1 Sep 2021 19:56:48 +0000 (14:56 -0500)]
Remove unused Logger

3 years agoMerge branch 'chores/2.4.1-develop' into 'develop'
Haelwenn [Sun, 29 Aug 2021 18:51:50 +0000 (18:51 +0000)]
Merge branch 'chores/2.4.1-develop' into 'develop'

Mergeback: 2.4.1

Closes #2758

See merge request pleroma/pleroma!3520

3 years agoMerge branch 'release/2.4.1' into 'stable'
Haelwenn [Sun, 29 Aug 2021 18:48:53 +0000 (18:48 +0000)]
Merge branch 'release/2.4.1' into 'stable'

Release: 2.4.1

See merge request pleroma/pleroma!3501

3 years agoMerge branch 'release/2.4.1' into chores/2.4.1-develop
Haelwenn (lanodan) Monnier [Sat, 28 Aug 2021 16:49:04 +0000 (18:49 +0200)]
Merge branch 'release/2.4.1' into chores/2.4.1-develop

3 years agoRelease 2.4.1
Haelwenn (lanodan) Monnier [Sat, 28 Aug 2021 16:31:56 +0000 (18:31 +0200)]
Release 2.4.1

3 years agomix pleroma.database set_text_search_config now runs concurrently and infinitely
someone [Sun, 15 Aug 2021 17:49:12 +0000 (13:49 -0400)]
mix pleroma.database set_text_search_config now runs concurrently and infinitely

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514

3 years agoSelecting MRF policies didn't work as intended any more
Ilja [Sat, 14 Aug 2021 11:42:32 +0000 (13:42 +0200)]
Selecting MRF policies didn't work as intended any more

* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
    * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
    * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509

3 years agoMake activity search properly use GIN indexes
Tusooa Zhu [Sat, 28 Aug 2021 01:43:50 +0000 (21:43 -0400)]
Make activity search properly use GIN indexes

The original approach to search in GIN indexes is to use
`to_tsvector(text)` in the WHERE clause of the query. According to
postgres docs [pdoc], this method does not make use of the index,
while `to_tsvector(config, text)` does. This commit changed the
query to use the two-argument `to_tsvector()`.

[pdoc]: https://www.postgresql.org/docs/12/textsearch-tables.html

To obtain the search config in use, we make a query to the db first.
The `::regconfig::oid` hack is needed because Postgrex does not support
regconfig type directly [postgrexbug]. I use the conversion from and to
`oid` instead of `text` because I tested in the actual DB and querying
using the conversion via `text` is slow just as the one-argument
`to_tsvector()` variant.

[postgrexbug]: https://github.com/elixir-ecto/postgrex/issues/502

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3519

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2758
3 years agoList available frontends also when no static/frontends folder is present yet
Ilja [Sat, 14 Aug 2021 18:42:12 +0000 (18:42 +0000)]
List available frontends also when no static/frontends folder is present yet

* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510

3 years agoAdd Admin-FE menu for StealEmojiPolicy
Sam Therapy [Sat, 14 Aug 2021 16:08:39 +0000 (11:08 -0500)]
Add Admin-FE menu for StealEmojiPolicy

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3512

3 years agoMerge branch 'set_text_search_config_timeout' into 'develop'
Haelwenn [Sat, 28 Aug 2021 16:11:52 +0000 (16:11 +0000)]
Merge branch 'set_text_search_config_timeout' into 'develop'

mix pleroma.database set_text_search_config now runs concurrently and infinitely

See merge request pleroma/pleroma!3514

3 years agoMerge branch 'docs_add_yunohost_installation' into 'develop'
Haelwenn [Sat, 28 Aug 2021 16:09:55 +0000 (16:09 +0000)]
Merge branch 'docs_add_yunohost_installation' into 'develop'

Add YunoHost to installation guides

See merge request pleroma/pleroma!3497

3 years agoMerge branch 'features/ingestion-no-nil' into 'develop'
Haelwenn [Sat, 28 Aug 2021 16:07:35 +0000 (16:07 +0000)]
Merge branch 'features/ingestion-no-nil' into 'develop'

ObjectValidator.stringify_keys: filter out nil values

See merge request pleroma/pleroma!3506

3 years agoMerge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop'
Haelwenn [Sat, 28 Aug 2021 16:06:35 +0000 (16:06 +0000)]
Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop'

Selecting MRF policies didn't work as intended any more

Closes admin-fe#198

See merge request pleroma/pleroma!3509

3 years agoMerge branch 'from/develop/tusooa/2758-gin-index-search' into 'develop'
Haelwenn [Sat, 28 Aug 2021 15:54:37 +0000 (15:54 +0000)]
Merge branch 'from/develop/tusooa/2758-gin-index-search' into 'develop'

Make activity search properly use GIN indexes

Closes #2758

See merge request pleroma/pleroma!3519

3 years agoAdd changelog for !3519
Tusooa Zhu [Sat, 28 Aug 2021 02:31:22 +0000 (22:31 -0400)]
Add changelog for !3519

3 years agoMake activity search properly use GIN indexes
Tusooa Zhu [Sat, 28 Aug 2021 01:43:50 +0000 (21:43 -0400)]
Make activity search properly use GIN indexes

The original approach to search in GIN indexes is to use
`to_tsvector(text)` in the WHERE clause of the query. According to
postgres docs [pdoc], this method does not make use of the index,
while `to_tsvector(config, text)` does. This commit changed the
query to use the two-argument `to_tsvector()`.

[pdoc]: https://www.postgresql.org/docs/12/textsearch-tables.html

To obtain the search config in use, we make a query to the db first.
The `::regconfig::oid` hack is needed because Postgrex does not support
regconfig type directly [postgrexbug]. I use the conversion from and to
`oid` instead of `text` because I tested in the actual DB and querying
using the conversion via `text` is slow just as the one-argument
`to_tsvector()` variant.

[postgrexbug]: https://github.com/elixir-ecto/postgrex/issues/502

BUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2758

3 years agoUserController: fall back to frontend when user isn't found
Alex Gleason [Tue, 17 Aug 2021 23:32:32 +0000 (18:32 -0500)]
UserController: fall back to frontend when user isn't found

3 years agomix pleroma.database set_text_search_config now runs concurrently and infinitely
someone [Sun, 15 Aug 2021 17:49:12 +0000 (13:49 -0400)]
mix pleroma.database set_text_search_config now runs concurrently and infinitely

3 years agoMerge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet...
Haelwenn [Sat, 14 Aug 2021 18:42:12 +0000 (18:42 +0000)]
Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop'

List available frontends also when no static/frontends folder is present yet

Closes admin-fe#201

See merge request pleroma/pleroma!3510

3 years agoList available frontends also when no static/frontends folder is present yet
Ilja [Sat, 14 Aug 2021 18:42:12 +0000 (18:42 +0000)]
List available frontends also when no static/frontends folder is present yet

* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already

3 years agoMerge branch 'StealEmojiMRF_add_adminFE' into 'develop'
Haelwenn [Sat, 14 Aug 2021 18:40:24 +0000 (18:40 +0000)]
Merge branch 'StealEmojiMRF_add_adminFE' into 'develop'

Add Admin-FE menu for StealEmojiPolicy

See merge request pleroma/pleroma!3512

3 years agoMerge branch 'builder-note' into 'develop'
Haelwenn [Sat, 14 Aug 2021 18:32:40 +0000 (18:32 +0000)]
Merge branch 'builder-note' into 'develop'

CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1

See merge request pleroma/pleroma!3511

3 years agoBuilder.note/1: return {:ok, map(), keyword()} like other Builder functions
Alex Gleason [Sat, 14 Aug 2021 16:24:55 +0000 (11:24 -0500)]
Builder.note/1: return {:ok, map(), keyword()} like other Builder functions

3 years agoAdd Admin-FE menu for StealEmojiPolicy
Sam Therapy [Sat, 14 Aug 2021 16:08:39 +0000 (11:08 -0500)]
Add Admin-FE menu for StealEmojiPolicy

3 years agoCommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
Alex Gleason [Sat, 14 Aug 2021 16:01:06 +0000 (11:01 -0500)]
CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1

3 years agoSelecting MRF policies didn't work as intended any more
Ilja [Sat, 14 Aug 2021 11:42:32 +0000 (13:42 +0200)]
Selecting MRF policies didn't work as intended any more

* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
    * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
    * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.

3 years agoStreamer: fix crash in MastodonAPI.StatusView
Alex Gleason [Fri, 13 Aug 2021 15:25:42 +0000 (10:25 -0500)]
Streamer: fix crash in MastodonAPI.StatusView

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508

3 years agoActivity.Search: fallback on status resolution on DB Timeout
Haelwenn (lanodan) Monnier [Thu, 12 Aug 2021 08:29:53 +0000 (10:29 +0200)]
Activity.Search: fallback on status resolution on DB Timeout

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3507

3 years agoAdminAPI: hotfix for nil report objects
Alex Gleason [Wed, 11 Aug 2021 14:38:16 +0000 (09:38 -0500)]
AdminAPI: hotfix for nil report objects

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504

3 years agomaybe_notify_subscribers: Don't create notifications from ingested replies
Haelwenn (lanodan) Monnier [Wed, 11 Aug 2021 17:45:49 +0000 (19:45 +0200)]
maybe_notify_subscribers: Don't create notifications from ingested replies

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505

3 years agoTwitterAPI: Make change_email require body params instead of query
Haelwenn (lanodan) Monnier [Tue, 10 Aug 2021 18:33:00 +0000 (20:33 +0200)]
TwitterAPI: Make change_email require body params instead of query

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503

3 years agoTwitterAPI: Make change_password require body params instead of query
Haelwenn (lanodan) Monnier [Tue, 10 Aug 2021 17:42:03 +0000 (19:42 +0200)]
TwitterAPI: Make change_password require body params instead of query

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503

3 years agoObjectAgePolicy: Fix pattern matching on published
Haelwenn (lanodan) Monnier [Tue, 10 Aug 2021 05:41:06 +0000 (07:41 +0200)]
ObjectAgePolicy: Fix pattern matching on published

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500

3 years agoMake the OPT recomendation clearer
Ilja [Tue, 10 Aug 2021 06:09:31 +0000 (06:09 +0000)]
Make the OPT recomendation clearer

AFAIK OTP releases are the recomended way of installing, but

  * People seem unaware of that and use from source installations because they use the guide with the name of their distro
  * People don't know what OTP releases are or what it means

I added a warning on all installation-from-source guides and added the same explanation on the two OTP pages (the miigration to OTP and installing OTP)

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3485

3 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
Haelwenn [Fri, 13 Aug 2021 15:55:33 +0000 (15:55 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!3491

3 years agofix: stream out Create Activity
kPherox [Mon, 9 Aug 2021 09:03:58 +0000 (09:03 +0000)]
fix: stream out Create Activity

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499

3 years agoTranslated using Weblate (Polish)
marcin mikołajczak [Fri, 13 Aug 2021 14:44:29 +0000 (14:44 +0000)]
Translated using Weblate (Polish)

Currently translated at 98.0% (102 of 104 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/

3 years agoTranslated using Weblate (Polish)
marcin mikołajczak [Mon, 26 Jul 2021 17:55:26 +0000 (17:55 +0000)]
Translated using Weblate (Polish)

Currently translated at 75.0% (78 of 104 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/

3 years agoMerge branch 'streamer-crash-fix' into 'develop'
Haelwenn [Fri, 13 Aug 2021 15:42:12 +0000 (15:42 +0000)]
Merge branch 'streamer-crash-fix' into 'develop'

Streamer crash fix

See merge request pleroma/pleroma!3508

3 years agoStreamer: fix crash in MastodonAPI.StatusView
Alex Gleason [Fri, 13 Aug 2021 15:25:42 +0000 (10:25 -0500)]
Streamer: fix crash in MastodonAPI.StatusView

3 years agoMerge branch 'dkuku-develop-patch-66061' into 'develop'
rinpatch [Fri, 13 Aug 2021 12:10:52 +0000 (12:10 +0000)]
Merge branch 'dkuku-develop-patch-66061' into 'develop'

Update dev.exs error message to write to stderr.

See merge request pleroma/pleroma!3492