nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
14085 commits 2 branches 0 tags 272 MiB
Commit graph

14085 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sadposter 23c758bbe7 enforce visibility 2021-12-12 18:25:20 +00:00
sadposter fdeef7d4df Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop 2021-12-12 17:39:44 +00:00
floatingghost cfb8aa7e59 Merge pull request 'feature/elasticsearch' (#1) from feature/elasticsearch into develop 
Reviewed-on: https://git.ihatebeinga.live/IHBAGang/pleroma/pulls/1
 2021-12-12 17:37:27 +00:00
FloatingGhost 0fbf7faf85 Remove IO inspect 2021-12-12 17:35:35 +00:00
FloatingGhost de60b1f3c1 make search provider configurable 2021-12-12 17:35:35 +00:00
FloatingGhost fce13cce46 add extra filters 2021-12-12 17:35:35 +00:00
FloatingGhost 449d8ff165 integrate search endpoint with ES 2021-12-12 17:35:35 +00:00
FloatingGhost 9002e5155b Add import functionality 2021-12-12 17:35:35 +00:00
Alex Gleason 938c95d75d VideoHandlingTest: remove nil values 2021-12-12 17:35:35 +00:00
Haelwenn ecab82dea7 Apply alexgleason's suggestion(s) to 1 file(s) 2021-12-12 17:35:35 +00:00
Alex Gleason 2936adbbce Fix VideoHandlingTest 2021-12-12 17:35:34 +00:00
Alex Gleason da83839dc1 AttachmentValidator: ingest width and height 2021-12-12 17:35:02 +00:00
Alex Gleason 494149f173 Transmogrifier: test fix_attachments/1 2021-12-12 17:35:02 +00:00
Alex Gleason 185d70ed3d Benchmarks: fix user timeline and tags benchmarks 2021-12-12 17:35:02 +00:00
Lain Soykaf eb7bbe3fc8 Linting. 2021-12-12 17:35:02 +00:00
Finn Behrens 66b60f1ee2 move result into with guard 2021-12-12 17:35:02 +00:00
Alex Gleason 2ac3d341b0 Fix benchmarks 2021-12-12 17:35:02 +00:00
FloatingGhost 0fab887eee make linter happy 2021-12-12 17:35:02 +00:00
FloatingGhost 429407ba0a Make deactivated user check into a subquery 
Fixes #2792
 2021-12-12 17:35:02 +00:00
sadposter 31b4acca61 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-12-06 20:25:54 +00:00
lain ab60c0c6c2 Merge branch 'optimisation/deactivated-subquery' into 'develop' 
Make deactivated user check into a subquery

Closes #2792

See merge request pleroma/pleroma!3554
 2021-12-06 19:55:52 +00:00
sadposter 6a6260f64e re-enable deactivated check 2021-12-06 12:03:16 +00:00
FloatingGhost db46913dcc make linter happy 2021-12-06 11:50:51 +00:00
FloatingGhost cd8bdbc761 Make deactivated user check into a subquery 
Fixes #2792
 2021-12-06 11:44:17 +00:00
sadposter b63dd6a5a2 don't track vmargs 2021-12-06 10:23:02 +00:00
sadposter f8d97a07b9 remove vmargs 2021-12-06 10:22:39 +00:00
sadposter ca2bd8b72b remove deactivated_users call 2021-12-06 10:18:16 +00:00
sadposter 6f86baf491 update adminfe 2021-12-06 10:17:54 +00:00
sadposter bb54720778 add debug 2021-12-05 21:56:11 +00:00
sadposter c85b278f1e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-12-05 15:01:23 +00:00
lain 5c573a8a28 Merge branch 'password-reset' into 'develop' 
Restore POST /auth/password, fixes #2789

Closes #2789

See merge request pleroma/pleroma!3550
 2021-12-03 15:13:10 +00:00
Alex Gleason ba2ed3c255
Fix frontend_status_plug_test.exs 2021-12-03 07:56:26 -06:00
Alex Gleason 8286ceb465
Merge remote-tracking branch 'origin/develop' into password-reset 2021-12-03 00:11:38 -06:00
Alex Gleason 5da4f33bf1
Restore POST /auth/password 2021-12-03 00:10:57 -06:00
lain 235c4139d7 Merge branch 'fix/2782-nodeinfo-active-users' into 'develop' 
nodeinfo: report activeMonth and activeHalfyear users fields

Closes #2782

See merge request pleroma/pleroma!3536
 2021-12-02 16:54:28 +00:00
lain aaed93db27 Merge branch 'update-hackney' into 'develop' 
Mix: upgrade Hackney to 1.18.0

Closes #2753

See merge request pleroma/pleroma!3549
 2021-12-01 15:49:57 +00:00
lain d486d7d09e 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
 2021-11-29 18:08:10 +00:00
NEETzsche 182c563ed0 Force pinned_objects to be empty, not null 2021-11-29 18:08:09 +00:00
a1batross 809503011f Mix: upgrade Hackney to 1.18.0 2021-11-29 17:28:10 +00:00
sadposter a61207cf8f Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-11-19 13:43:24 +00:00
Alibek Omarov efc28812b8 Add changelog entry 2021-11-17 00:39:10 +01:00
Haelwenn c97f99ccf2 Merge branch 'bugfix/markdown-newlines' into 'develop' 
mix: Update earmark

See merge request pleroma/pleroma!3538
 2021-11-16 13:54:34 +00:00
Haelwenn (lanodan) Monnier 5e15ceb49d mix: Update earmark 
This should fix the presence of extraneous newlines in markdown output.

Related: https://github.com/pragdave/earmark/issues/406
 2021-11-16 14:33:27 +01:00
lain add2b9cd8d Merge branch 'update-elixir' into 'develop' 
CI: Upload the image for all platforms

See merge request pleroma/pleroma!3537
 2021-11-15 20:17:38 +00:00
Lain Soykaf f78cb6ab9a CI: Upload the image for all platforms 
For some reason the other platforms started failing, too. This
fixes it. Why? Don't know.
 2021-11-15 21:04:43 +01:00
Alibek Omarov 04aca335aa nodeinfo: report activeMonth and activeHalfyear users fields 2021-11-15 17:01:30 +01:00
lain 4d341f51e1 Merge branch 'fix-tests' into 'develop' 
Test fixes

See merge request pleroma/pleroma!3532
 2021-11-15 14:31:27 +00:00
lain e2772d6bf1 Merge branch 'block-behavior' into 'develop' 
Configurable block visibility, fixes #2123

Closes #2123

See merge request pleroma/pleroma!3242
 2021-11-15 14:27:59 +00:00
lain 6e3df11693 Merge branch 'instance-deletion' into 'develop' 
AdminAPI: endpoint to delete all content from a remote instance

See merge request pleroma/pleroma!3483
 2021-11-15 14:24:13 +00:00
lain 6aff3d3204 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
 2021-11-15 13:21:42 +00:00