aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-26Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finchLain Soykaf
2021-12-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finchLain Soykaf
2021-12-26CI: Start testing erratic test againLain Soykaf
Erratic tests are now ran in their own task, so we don't block normal testing. The runtime is under a minute, so even if this one has to be retried, it shouldn't take forever.
2021-12-26Merge branch 'ci-dont-retry' into 'develop'Alex Gleason
GitLab CI: don't retry failed jobs See merge request pleroma/pleroma!3574
2021-12-26Merge branch 'profile-directory' into 'develop'Alex Gleason
MastoAPI: Profile directory See merge request pleroma/pleroma!3573
2021-12-26MastoAPI: Profile directorymarcin mikołajczak
2021-12-26Merge branch 'notice-routes' into 'develop'Alex Gleason
Add notice compatibility routes for other frontends Closes #1785 See merge request pleroma/pleroma!3402
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
MastoAPI: Add user notes on accounts See merge request pleroma/pleroma!3540
2021-12-25Merge branch 'account-subscriptions' into 'develop'Alex Gleason
MastoAPI: accept notify param in follow request See merge request pleroma/pleroma!3555
2021-12-25Merge branch 'remote-follow-api' into 'develop'Alex Gleason
remote_interaction API endpoint See merge request pleroma/pleroma!3545
2021-12-25Merge remote-tracking branch 'origin/develop' into remote-follow-apimarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-23Merge branch 'warnings-as-errors' into 'develop'Alex Gleason
Enable :warnings_as_errors for CI only See merge request pleroma/pleroma!3474
2021-12-23Merge branch 'add-nodeinfo-doc' into 'develop'Alex Gleason
Add initial Nodeinfo document See merge request pleroma/pleroma!3546
2021-12-23Add initial Nodeinfo documentHakaba Hitoyo
2021-12-23Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'Alex Gleason
Handle Reject for already-accepted Follows properly Closes #2766 and #2802 See merge request pleroma/pleroma!3568
2021-12-22Merge branch 'moderators' into 'develop'Alex Gleason
AdminAPI: let moderators actually do things Closes #2490 See merge request pleroma/pleroma!3480
2021-12-22Merge branch 'erratic-tests' into 'develop'Alex Gleason
Skip erratic tests See merge request pleroma/pleroma!3572
2021-12-21Skip erratic testsAlex Gleason
2021-12-19Merge remote-tracking branch 'origin/develop' into moderatorsAlex Gleason
2021-12-19Merge branch 'mkljczk-develop-patch-64464' into 'develop'Alex Gleason
Add "exposable_reactions" to features, if showing reactions See merge request pleroma/pleroma!3523
2021-12-19Merge branch 'manifest' into 'develop'Alex Gleason
Expose /manifest.json for PWA Closes #882 See merge request pleroma/pleroma!3544
2021-12-19Slow queries logging improvements: added EXPLAIN results, listed params, ↵Ivan Tashkinov
improved stacktrace.
2021-12-19Merge branch 'replies-count' into 'develop'Alex Gleason
Fix replies count for remote replies See merge request pleroma/pleroma!3541
2021-12-19Merge branch 'link-headers-chats' into 'develop'Alex Gleason
Add link headers in ChatController.index2 See merge request pleroma/pleroma!3562
2021-12-19Merge branch 'live-dashboard' into 'develop'Alex Gleason
Add Phoenix LiveDashboard See merge request pleroma/pleroma!3566
2021-12-19Merge remote-tracking branch 'origin/develop' into manifestAlex Gleason
2021-12-19Merge branch 'v2-suggestions' into 'develop'Alex Gleason
V2 suggestions See merge request pleroma/pleroma!3547
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 00:27:43 +0000