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-17LintTusooa Zhu
2021-12-17Add changelog for ↵Tusooa Zhu
https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568
2021-12-17Add test to ensure removed follower cease to have relationship with ex-followeeTusooa Zhu
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
2021-12-17Add test to ensure the blocked cease to have follow relationship to the blockerTusooa Zhu
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
2021-12-17Allow updating accepted follow activities in ↵Tusooa Zhu
Web.ActivityPub.Utils.update_follow_state_for_all/2 Mastodon uses the Reject activity also for the purpose of removing a follower, in addition to reject a follow request. We should also update the original Follow activity in this case.
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-16Dirty hack to make mediaproxy functional by relying on Hackney for that partMark Felder
2021-12-15Merge remote-tracking branch 'origin/develop' into live-dashboardAlex Gleason
2021-12-15Add Phoenix LiveDashboardAlex Gleason
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
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-15Application: Actually start finch if it's neededLain Soykaf
2021-12-15Application, dependencies: prepare for finchLain Soykaf
2021-12-13TwitterAPI: allow deleting one's own account with request bodyAlex Gleason
2021-12-12Search: limit number of resultsAlex Gleason
2021-12-12Add link headers in ChatController.index2marcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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-06Add 'notifying' to relationship for compatibility with Mastodonmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06Add test for following with subscriptionmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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-06MastoAPI: accept notify param in follow requestmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06make linter happyFloatingGhost
2021-12-06Make deactivated user check into a subqueryFloatingGhost
Fixes #2792
2021-12-05Log Ecto queries > 500msAlex Gleason
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-02remote_interaction API endpointmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-01Merge branch 'update-hackney' into 'develop'lain
Mix: upgrade Hackney to 1.18.0 Closes #2753 See merge request pleroma/pleroma!3549
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 00:18:43 +0000