FloatingGhost [Thu, 16 Dec 2021 16:10:08 +0000 (16:10 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop
FloatingGhost [Thu, 16 Dec 2021 15:20:22 +0000 (15:20 +0000)]
maybe
FloatingGhost [Thu, 16 Dec 2021 15:09:36 +0000 (15:09 +0000)]
fix remote hashtags
lain [Wed, 15 Dec 2021 21:26:45 +0000 (21:26 +0000)]
Merge branch 'delete-account-fix' into 'develop'
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
sadposter [Wed, 15 Dec 2021 11:05:30 +0000 (11:05 +0000)]
don't try indexing non-people
FloatingGhost [Wed, 15 Dec 2021 10:57:47 +0000 (10:57 +0000)]
re-add fetching by url
sadposter [Tue, 14 Dec 2021 15:02:11 +0000 (15:02 +0000)]
fix empty queries returning 50 results
sadposter [Tue, 14 Dec 2021 14:48:24 +0000 (14:48 +0000)]
extra cool
FloatingGhost [Tue, 14 Dec 2021 14:33:34 +0000 (14:33 +0000)]
add timeouts
sadposter [Tue, 14 Dec 2021 14:16:21 +0000 (14:16 +0000)]
filter by user type
sadposter [Tue, 14 Dec 2021 14:01:09 +0000 (14:01 +0000)]
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
sadposter [Tue, 14 Dec 2021 13:58:16 +0000 (13:58 +0000)]
fix inbound federation
FloatingGhost [Tue, 14 Dec 2021 13:53:46 +0000 (13:53 +0000)]
Search through users and hashtags as well
FloatingGhost [Tue, 14 Dec 2021 12:37:10 +0000 (12:37 +0000)]
add hashtag indexing
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
Alex Gleason [Mon, 13 Dec 2021 21:15:33 +0000 (16:15 -0500)]
TwitterAPI: allow deleting one's own account with request body
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
sadposter [Sun, 12 Dec 2021 17:39:44 +0000 (17:39 +0000)]
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
floatingghost [Sun, 12 Dec 2021 17:37:27 +0000 (17:37 +0000)]
Merge pull request 'feature/elasticsearch' (#1) from feature/elasticsearch into develop
Reviewed-on: https://git.ihatebeinga.live/IHBAGang/pleroma/pulls/1
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
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:35:34 +0000 (13:35 -0500)]
Fix VideoHandlingTest
Alex Gleason [Tue, 7 Dec 2021 17:59:03 +0000 (12:59 -0500)]
AttachmentValidator: ingest width and height
Alex Gleason [Tue, 7 Dec 2021 06:10:47 +0000 (01:10 -0500)]
Transmogrifier: test fix_attachments/1
Alex Gleason [Wed, 8 Dec 2021 17:54:41 +0000 (11:54 -0600)]
Benchmarks: fix user timeline and tags benchmarks
Lain Soykaf [Tue, 7 Dec 2021 17:12:23 +0000 (12:12 -0500)]
Linting.
Finn Behrens [Tue, 7 Dec 2021 08:18:53 +0000 (09:18 +0100)]
move result into with guard
Alex Gleason [Fri, 3 Dec 2021 21:20:54 +0000 (16:20 -0500)]
Fix benchmarks
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
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
sadposter [Mon, 6 Dec 2021 20:25:54 +0000 (20:25 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
sadposter [Mon, 6 Dec 2021 12:03:16 +0000 (12:03 +0000)]
re-enable deactivated check
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
sadposter [Mon, 6 Dec 2021 10:23:02 +0000 (10:23 +0000)]
don't track vmargs
sadposter [Mon, 6 Dec 2021 10:22:39 +0000 (10:22 +0000)]
remove vmargs
sadposter [Mon, 6 Dec 2021 10:18:16 +0000 (10:18 +0000)]
remove deactivated_users call
sadposter [Mon, 6 Dec 2021 10:17:54 +0000 (10:17 +0000)]
update adminfe
sadposter [Sun, 5 Dec 2021 21:56:11 +0000 (21:56 +0000)]
add debug
sadposter [Sun, 5 Dec 2021 15:01:23 +0000 (15:01 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
sadposter [Fri, 19 Nov 2021 13:43:24 +0000 (13:43 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
projects / akkoma / log