summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-12-26CI: Start testing erratic test againLain Soykaf
2021-12-26Merge branch 'ci-dont-retry' into 'develop'Alex Gleason
2021-12-26Merge branch 'profile-directory' into 'develop'Alex Gleason
2021-12-26MastoAPI: Profile directorymarcin mikołajczak
2021-12-26Merge branch 'notice-routes' into 'develop'Alex Gleason
2021-12-25GitLab CI: don't retry failed jobsAlex Gleason
2021-12-25Pleroma.Web.base_url() --> Endpoint.url()Alex Gleason
2021-12-25Merge remote-tracking branch 'origin/develop' into notice-routesAlex Gleason
2021-12-25Merge branch 'account-notes' into 'develop'Alex Gleason
2021-12-25Merge branch 'account-subscriptions' into 'develop'Alex Gleason
2021-12-25Merge branch 'remote-follow-api' into 'develop'Alex Gleason
2021-12-25Merge remote-tracking branch 'origin/develop' into remote-follow-apimarcin mikołajczak
2021-12-23Merge branch 'warnings-as-errors' into 'develop'Alex Gleason
2021-12-23Merge branch 'add-nodeinfo-doc' into 'develop'Alex Gleason
2021-12-23Add initial Nodeinfo documentHakaba Hitoyo
2021-12-23Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'Alex Gleason
2021-12-22Merge branch 'moderators' into 'develop'Alex Gleason
2021-12-22Merge branch 'erratic-tests' into 'develop'Alex Gleason
2021-12-21Skip erratic testsAlex Gleason
2021-12-19Merge remote-tracking branch 'origin/develop' into moderatorsmoderatorsAlex Gleason
2021-12-19Merge branch 'mkljczk-develop-patch-64464' into 'develop'Alex Gleason
2021-12-19Merge branch 'manifest' into 'develop'Alex Gleason
2021-12-19Slow queries logging improvements: added EXPLAIN results, listed params, impr...log-slow-queriesIvan Tashkinov
2021-12-19Merge branch 'replies-count' into 'develop'Alex Gleason
2021-12-19Merge branch 'link-headers-chats' into 'develop'Alex Gleason
2021-12-19Merge branch 'live-dashboard' into 'develop'Alex Gleason
2021-12-19Merge remote-tracking branch 'origin/develop' into manifestAlex Gleason
2021-12-19Merge branch 'v2-suggestions' into 'develop'Alex Gleason
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