FloatingGhost [Mon, 13 Dec 2021 20:27:35 +0000 (20:27 +0000)]
add user import
FloatingGhost [Mon, 13 Dec 2021 20:15:17 +0000 (20:15 +0000)]
add mappings
sadposter [Sun, 12 Dec 2021 20:01:07 +0000 (20:01 +0000)]
fix buggos
FloatingGhost [Sun, 12 Dec 2021 19:40:31 +0000 (19:40 +0000)]
fully reference es
FloatingGhost [Sun, 12 Dec 2021 19:40:05 +0000 (19:40 +0000)]
fix multi-after-transaction
FloatingGhost [Sun, 12 Dec 2021 19:39:07 +0000 (19:39 +0000)]
pipeline it
sadposter [Sun, 12 Dec 2021 19:31:47 +0000 (19:31 +0000)]
fix bug in inbound
sadposter [Sun, 12 Dec 2021 18:25:20 +0000 (18:25 +0000)]
enforce visibility
FloatingGhost [Sun, 12 Dec 2021 17:26:06 +0000 (17:26 +0000)]
Remove IO inspect
FloatingGhost [Sun, 12 Dec 2021 17:23:44 +0000 (17:23 +0000)]
make search provider configurable
FloatingGhost [Sat, 11 Dec 2021 19:56:15 +0000 (19:56 +0000)]
add extra filters
FloatingGhost [Sat, 11 Dec 2021 18:48:46 +0000 (18:48 +0000)]
integrate search endpoint with ES
FloatingGhost [Sat, 11 Dec 2021 17:36:49 +0000 (17:36 +0000)]
Add import functionality
lain [Thu, 9 Dec 2021 16:05:06 +0000 (16:05 +0000)]
Merge branch 'fix-attachment-dimensions' into 'develop'
Fix attachment dimensions
Closes #2794
See merge request pleroma/pleroma!3559
lain [Thu, 9 Dec 2021 15:38:26 +0000 (15:38 +0000)]
Merge branch 'benchmark-fixes' into 'develop'
Benchmarks: fix user timeline and tags benchmarks
See merge request pleroma/pleroma!3560
Alex Gleason [Wed, 8 Dec 2021 17:54:41 +0000 (11:54 -0600)]
Benchmarks: fix user timeline and tags benchmarks
Alex Gleason [Wed, 8 Dec 2021 02:55:54 +0000 (21:55 -0500)]
VideoHandlingTest: remove nil values
Haelwenn [Tue, 7 Dec 2021 22:53:36 +0000 (22:53 +0000)]
Apply alexgleason's suggestion(s) to 1 file(s)
Alex Gleason [Tue, 7 Dec 2021 18:41:54 +0000 (13:41 -0500)]
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
Alex Gleason [Tue, 7 Dec 2021 18:35:34 +0000 (13:35 -0500)]
Fix VideoHandlingTest
lain [Tue, 7 Dec 2021 18:19:43 +0000 (18:19 +0000)]
Merge branch 'fixyfix' into 'develop'
Linting.
See merge request pleroma/pleroma!3558
Alex Gleason [Tue, 7 Dec 2021 17:59:03 +0000 (12:59 -0500)]
AttachmentValidator: ingest width and height
Lain Soykaf [Tue, 7 Dec 2021 17:12:23 +0000 (12:12 -0500)]
Linting.
lain [Tue, 7 Dec 2021 16:55:01 +0000 (16:55 +0000)]
Merge branch 'pleroma-result-1_13' into 'develop'
move result into with guard
See merge request pleroma/pleroma!3557
lain [Tue, 7 Dec 2021 16:45:03 +0000 (16:45 +0000)]
Merge branch 'mix-lock' into 'develop'
Run `mix deps.get`
See merge request pleroma/pleroma!3556
Alex Gleason [Tue, 7 Dec 2021 15:03:31 +0000 (10:03 -0500)]
Run `mix deps.get`
Finn Behrens [Tue, 7 Dec 2021 08:18:53 +0000 (09:18 +0100)]
move result into with guard
Alex Gleason [Tue, 7 Dec 2021 06:10:47 +0000 (01:10 -0500)]
Transmogrifier: test fix_attachments/1
lain [Mon, 6 Dec 2021 21:16:30 +0000 (21:16 +0000)]
Merge branch 'benchmark' into 'develop'
Fix benchmarks
See merge request pleroma/pleroma!3551
lain [Mon, 6 Dec 2021 19:55:52 +0000 (19:55 +0000)]
Merge branch 'optimisation/deactivated-subquery' into 'develop'
Make deactivated user check into a subquery
Closes #2792
See merge request pleroma/pleroma!3554
FloatingGhost [Mon, 6 Dec 2021 11:50:51 +0000 (11:50 +0000)]
make linter happy
FloatingGhost [Mon, 6 Dec 2021 11:44:17 +0000 (11:44 +0000)]
Make deactivated user check into a subquery
Fixes #2792
Alex Gleason [Fri, 3 Dec 2021 21:20:54 +0000 (16:20 -0500)]
Fix benchmarks
lain [Fri, 3 Dec 2021 15:13:10 +0000 (15:13 +0000)]
Merge branch 'password-reset' into 'develop'
Restore POST /auth/password, fixes #2789
Closes #2789
See merge request pleroma/pleroma!3550
Alex Gleason [Fri, 3 Dec 2021 13:56:26 +0000 (07:56 -0600)]
Fix frontend_status_plug_test.exs
Alex Gleason [Fri, 3 Dec 2021 06:11:38 +0000 (00:11 -0600)]
Merge remote-tracking branch 'origin/develop' into password-reset
Alex Gleason [Fri, 3 Dec 2021 06:02:49 +0000 (00:02 -0600)]
Restore POST /auth/password
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
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
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
NEETzsche [Mon, 29 Nov 2021 18:08:09 +0000 (18:08 +0000)]
Force pinned_objects to be empty, not null
a1batross [Mon, 29 Nov 2021 17:28:10 +0000 (17:28 +0000)]
Mix: upgrade Hackney to 1.18.0
Alibek Omarov [Tue, 16 Nov 2021 23:39:10 +0000 (00:39 +0100)]
Add changelog entry
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
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
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
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.
Alibek Omarov [Mon, 15 Nov 2021 15:58:25 +0000 (16:58 +0100)]
nodeinfo: report activeMonth and activeHalfyear users fields
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
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
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
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
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
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
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
Lain Soykaf [Sun, 14 Nov 2021 19:37:32 +0000 (20:37 +0100)]
CI: Conservatively update release images so they keep building.
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
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
Lain Soykaf [Sun, 14 Nov 2021 15:04:08 +0000 (16:04 +0100)]
Mix: Update crypt to fix musl builds.
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.
Lain Soykaf [Sun, 14 Nov 2021 10:44:24 +0000 (11:44 +0100)]
StealEmojiPolicyTest: Make mocks explicit.
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.
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
Haelwenn (lanodan) Monnier [Tue, 9 Nov 2021 23:53:32 +0000 (00:53 +0100)]
mix: Update http_signatures to 0.1.1
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
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)
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
Mark Felder [Wed, 6 Oct 2021 15:49:25 +0000 (10:49 -0500)]
Fix typo
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
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/
Ryo Ueno [Sat, 18 Sep 2021 09:07:55 +0000 (09:07 +0000)]
Added translation using Weblate (Japanese)
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/
Hồ Nhất Duy [Mon, 6 Sep 2021 11:13:18 +0000 (11:13 +0000)]
Added translation using Weblate (Vietnamese)
@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/
@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/
@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/
@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/
@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/
@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/
@liimee [Sun, 15 Aug 2021 15:40:52 +0000 (15:40 +0000)]
Added translation using Weblate (Indonesian)
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/
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
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`
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
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
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
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
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
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
partev [Sun, 12 Sep 2021 15:31:49 +0000 (15:31 +0000)]
fix a typo "Optionnal" -> "Optional"
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
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
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
Mark Felder [Wed, 1 Sep 2021 19:56:48 +0000 (14:56 -0500)]
Remove unused Logger
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
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
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
Haelwenn (lanodan) Monnier [Sat, 28 Aug 2021 16:31:56 +0000 (18:31 +0200)]
Release 2.4.1
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
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