FloatingGhost [Thu, 16 Dec 2021 16:13:41 +0000 (16:13 +0000)]
Merge remote-tracking branch 'origin/feature/elasticsearch' into develop
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 16:07:15 +0000 (16:07 +0000)]
Merge branch 'develop' into feature/elasticsearch
FloatingGhost [Thu, 16 Dec 2021 16:07:00 +0000 (16:07 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
FloatingGhost [Thu, 16 Dec 2021 16:05:33 +0000 (16:05 +0000)]
format
FloatingGhost [Thu, 16 Dec 2021 16:05:18 +0000 (16:05 +0000)]
add timestamp
FloatingGhost [Thu, 16 Dec 2021 15:58:56 +0000 (15:58 +0000)]
add timestamp
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
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
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
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
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
FloatingGhost [Tue, 14 Dec 2021 14:33:34 +0000 (14:33 +0000)]
add timeouts
FloatingGhost [Tue, 14 Dec 2021 14:28:15 +0000 (14:28 +0000)]
merge
sadposter [Tue, 14 Dec 2021 13:58:16 +0000 (13:58 +0000)]
fix inbound federation
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
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
Alex Gleason [Mon, 13 Dec 2021 21:15:33 +0000 (16:15 -0500)]
TwitterAPI: allow deleting one's own account with request body
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
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
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
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