aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-19Merge branch 'fix-search-dos' into 'develop'Alex Gleason
Search: limit number of results (prevent DoS) See merge request pleroma/pleroma!3563
2021-12-18Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'lain
Bump alpine to 3.14 See merge request pleroma/pleroma!3569
2021-12-17Bump alpine to 3.14Tusooa Zhu
2021-12-17Merge branch 'verbose-emoji-loader' into 'develop'lain
emoji/loader.ex: be more verbose about which emoji pack config is loading now See merge request pleroma/pleroma!3567
2021-12-17emoji/loader.ex: be more verbose about which emoji pack config is loading now a1batross
To avoid issue when one of the hundred JSON files is malformed and administrator don't know which one
2021-12-15Merge branch 'delete-account-fix' into 'develop'lain
TwitterAPI: allow deleting one's own account with request body Closes #2799 and #2746 See merge request pleroma/pleroma!3564
2021-12-13TwitterAPI: allow deleting one's own account with request bodyAlex Gleason
2021-12-12Search: limit number of resultsAlex Gleason
2021-12-09Merge branch 'fix-attachment-dimensions' into 'develop'2795-small-fix-for-elixir-1-13lain
Fix attachment dimensions Closes #2794 See merge request pleroma/pleroma!3559
2021-12-09Merge branch 'benchmark-fixes' into 'develop'lain
Benchmarks: fix user timeline and tags benchmarks See merge request pleroma/pleroma!3560
2021-12-08Benchmarks: fix user timeline and tags benchmarksAlex Gleason
2021-12-07VideoHandlingTest: remove nil valuesAlex Gleason
2021-12-07Apply alexgleason's suggestion(s) to 1 file(s)Haelwenn
2021-12-07Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensionsAlex Gleason
2021-12-07Fix VideoHandlingTestAlex Gleason
2021-12-07Merge branch 'fixyfix' into 'develop'lain
Linting. See merge request pleroma/pleroma!3558
2021-12-07AttachmentValidator: ingest width and heightAlex Gleason
2021-12-07Linting.Lain Soykaf
2021-12-07Merge branch 'pleroma-result-1_13' into 'develop'lain
move result into with guard See merge request pleroma/pleroma!3557
2021-12-07Merge branch 'mix-lock' into 'develop'lain
Run `mix deps.get` See merge request pleroma/pleroma!3556
2021-12-07Run `mix deps.get`Alex Gleason
2021-12-07move result into with guardFinn Behrens
2021-12-07Transmogrifier: test fix_attachments/1Alex Gleason
2021-12-06Merge branch 'benchmark' into 'develop'lain
Fix benchmarks See merge request pleroma/pleroma!3551
2021-12-06Merge branch 'optimisation/deactivated-subquery' into 'develop'lain
Make deactivated user check into a subquery Closes #2792 See merge request pleroma/pleroma!3554
2021-12-06make linter happyFloatingGhost
2021-12-06Make deactivated user check into a subqueryFloatingGhost
Fixes #2792
2021-12-03Fix benchmarksAlex Gleason
2021-12-03Merge branch 'password-reset' into 'develop'lain
Restore POST /auth/password, fixes #2789 Closes #2789 See merge request pleroma/pleroma!3550
2021-12-03Fix frontend_status_plug_test.exsAlex Gleason
2021-12-03Merge remote-tracking branch 'origin/develop' into password-resetAlex Gleason
2021-12-03Restore POST /auth/passwordAlex Gleason
2021-12-02Merge branch 'fix/2782-nodeinfo-active-users' into 'develop'lain
nodeinfo: report activeMonth and activeHalfyear users fields Closes #2782 See merge request pleroma/pleroma!3536
2021-12-01Merge branch 'update-hackney' into 'develop'lain
Mix: upgrade Hackney to 1.18.0 Closes #2753 See merge request pleroma/pleroma!3549
2021-11-29Merge branch 'force_pinned_objects_to_be_empty' into 'develop'lain
Force pinned_objects to be empty, not null Closes #2788 See merge request pleroma/pleroma!3548
2021-11-29Force pinned_objects to be empty, not nullNEETzsche
2021-11-29Mix: upgrade Hackney to 1.18.0a1batross
2021-11-17Add changelog entryAlibek Omarov
2021-11-16Merge branch 'bugfix/markdown-newlines' into 'develop'Haelwenn
mix: Update earmark See merge request pleroma/pleroma!3538
2021-11-16mix: Update earmarkHaelwenn (lanodan) Monnier
This should fix the presence of extraneous newlines in markdown output. Related: https://github.com/pragdave/earmark/issues/406
2021-11-15Merge branch 'update-elixir' into 'develop'lain
CI: Upload the image for all platforms See merge request pleroma/pleroma!3537
2021-11-15CI: Upload the image for all platformsLain Soykaf
For some reason the other platforms started failing, too. This fixes it. Why? Don't know.
2021-11-15nodeinfo: report activeMonth and activeHalfyear users fieldsAlibek Omarov
2021-11-15Merge branch 'fix-tests' into 'develop'lain
Test fixes See merge request pleroma/pleroma!3532
2021-11-15Merge branch 'block-behavior' into 'develop'lain
Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242
2021-11-15Merge branch 'instance-deletion' into 'develop'lain
AdminAPI: endpoint to delete all content from a remote instance See merge request pleroma/pleroma!3483
2021-11-15Merge branch 'fix-object-deletion-timeout' into 'develop'lain
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-15Merge branch 'bump/http_signatures-0.1.1' into 'develop'lain
mix: Update http_signatures to 0.1.1 See merge request pleroma/pleroma!3530
2021-11-15Merge branch 'userfeed-fe-fallback' into 'develop'lain
UserController: fall back to frontend when user isn't found Closes #2730 See merge request pleroma/pleroma!3515
2021-11-14Merge branch 'fix-releases' into 'develop'lain
CI: Conservatively update release images so they keep building. See merge request pleroma/pleroma!3534
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-27 07:52:50 +0000