summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-24mix formatobject-flakeAlex Gleason
2021-12-24Change HashtagsTableMigrator to use %DataMigrationFailedId{} structs with ↵Alex Gleason
FlakeIds
2021-12-24Object FlakeIds: also update data_migration_failed_ids tableAlex Gleason
2021-12-23Merge remote-tracking branch 'origin/develop' into object-flakeAlex Gleason
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 moderatorsmoderatorsAlex 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-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-18Let "context_id" be a stringAlex Gleason
2021-12-18Use string IDs in PaginationTestAlex Gleason
2021-12-18Create HashtagObject schemaAlex Gleason
Without it we can't specify that the object's ID is a FlakeId
2021-12-18Change Object ID to FlakeIdAlex Gleason
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-15Merge remote-tracking branch 'origin/develop' into live-dashboardlive-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-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
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 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
Linting. See merge request pleroma/pleroma!3558
2021-12-07AttachmentValidator: ingest width and heightAlex Gleason
2021-12-07Linting.fixyfixLain Soykaf
2021-12-07Merge branch 'pleroma-result-1_13' into 'develop'lain
move result into with guard See merge request pleroma/pleroma!3557
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-05 16:10:05 +0000