summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-12-19Merge branch 'fix-search-dos' into 'develop'Alex Gleason
2021-12-18Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'lain
2021-12-17Bump alpine to 3.14Tusooa Zhu
2021-12-17LintTusooa Zhu
2021-12-17Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests...Tusooa Zhu
2021-12-17Add test to ensure removed follower cease to have relationship with ex-followeeTusooa Zhu
2021-12-17Add test to ensure the blocked cease to have follow relationship to the blockerTusooa Zhu
2021-12-17Allow updating accepted follow activities in Web.ActivityPub.Utils.update_fol...Tusooa Zhu
2021-12-17Merge branch 'verbose-emoji-loader' into 'develop'lain
2021-12-17emoji/loader.ex: be more verbose about which emoji pack config is loading now a1batross
2021-12-16Dirty hack to make mediaproxy functional by relying on Hackney for that partfinchMark Felder
2021-12-15Merge remote-tracking branch 'origin/develop' into live-dashboardlive-dashboardAlex Gleason
2021-12-15Add Phoenix LiveDashboardAlex Gleason
2021-12-15Merge branch 'delete-account-fix' into 'develop'lain
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 bodydelete-account-fixAlex Gleason
2021-12-12Search: limit number of resultsfix-search-dosAlex Gleason
2021-12-12Add link headers in ChatController.index2marcin mikołajczak
2021-12-09Merge branch 'fix-attachment-dimensions' into 'develop'2795-small-fix-for-elixir-1-13lain
2021-12-09Merge branch 'benchmark-fixes' into 'develop'lain
2021-12-08Benchmarks: fix user timeline and tags benchmarksbenchmark-fixesAlex Gleason
2021-12-07VideoHandlingTest: remove nil valuesfix-attachment-dimensionsAlex 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
2021-12-07AttachmentValidator: ingest width and heightAlex Gleason
2021-12-07Linting.fixyfixLain Soykaf
2021-12-07Merge branch 'pleroma-result-1_13' into 'develop'lain
2021-12-07Merge branch 'mix-lock' into 'develop'lain
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
2021-12-06Add 'notifying' to relationship for compatibility with Mastodonmarcin mikołajczak
2021-12-06Add test for following with subscriptionmarcin mikołajczak
2021-12-06Merge branch 'optimisation/deactivated-subquery' into 'develop'lain
2021-12-06MastoAPI: accept notify param in follow requestmarcin mikołajczak
2021-12-06make linter happyFloatingGhost
2021-12-06Make deactivated user check into a subqueryFloatingGhost
2021-12-05Log Ecto queries > 500msAlex Gleason
2021-12-03Fix benchmarksAlex Gleason
2021-12-03Merge branch 'password-reset' into 'develop'lain
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
2021-12-02remote_interaction API endpointmarcin mikołajczak
2021-12-01Merge branch 'update-hackney' into 'develop'lain