aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-01-15Merge remote-tracking branch 'origin/develop' into operation-warpsneedAlex Gleason
2022-01-14Merge branch 'show_blockers_visible' into 'develop'Alex Gleason
2022-01-14Add blockers_visible to features list when it's enabledNEETzsche
2022-01-14Merge branch 'mergeback' into 'develop'rinpatch
2022-01-14Merge remote-tracking branch 'origin/stable' into mergebackAlex Gleason
2022-01-13Merge branch 'account-endorsements' into 'develop'Alex Gleason
2022-01-12Add more testsmarcin mikołajczak
2022-01-12WIP account endorsementsmarcin mikołajczak
2022-01-11Merge branch 'release/2.4.2' into 'stable'v2.4.2rinpatch
2022-01-11CI: Conservatively update release images so they keep building.Lain Soykaf
2022-01-11CI: Upload the image for all platformsLain Soykaf
2022-01-11Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdfrinpatch
2022-01-11mix.lock: sync with mix.exsrinpatch
2022-01-11Add 2.4.2 changelog entry and bump mix versionrinpatch
2022-01-11Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop'Alex Gleason
2022-01-11Merge branch 'pleroma-result-1_13' into 'develop'lain
2022-01-10Merge remote-tracking branch 'origin/develop' into account-endorsementsmarcin mikołajczak
2022-01-10Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop'Alex Gleason
2022-01-10Escape unicode RTL overrides in rich media parser testsrinpatch
2022-01-10Merge branch 'update-hackney' into 'develop'lain
2022-01-09CombineActivitiesAndObjects: add back "ON CONFLICT DO NOTHING"Alex Gleason
2022-01-09Notifications: change blocking/blockers queries to make notifications load againAlex Gleason
2022-01-09ActivityPub: change blocking/blockers queries to make timelines load againAlex Gleason
2022-01-07Merge branch 'api-docs-fixes' into 'develop'Alex Gleason
2022-01-07Docs: fix various Pleroma API endpoints paths, fix MFA responseAlex Gleason
2022-01-05Remove unused ObjectId.shift_id/2Alex Gleason
2022-01-02ChangeObjectIdToFlake: add "on delete cascade" to deliveries fkeyAlex Gleason
2022-01-02Remove pleroma.database remove_embedded_objects mix taskAlex Gleason
2022-01-02ResolveActivityObjectConflicts: move the triggers disable/enable into the mig...Alex Gleason
2022-01-02Merge branch 'change/web-push-encryption-dep' into 'develop'Alex Gleason
2022-01-01Upgrade web_push_encryption to 0.3.1Sean King
2022-01-01ResolveActivityObjectConflicts: fix the foreign key error (temporarily disabl...Alex Gleason
2022-01-01ResolveActivityObjectConflicts: fix foreign key errorsAlex Gleason
2022-01-01Fix migration of RUM serversAlex Gleason
2022-01-01ResolveActivityObjectConflicts: lock tables, disable fkey constraints for tra...Alex Gleason
2022-01-01Merge branch 'change/concurrent-limiter-dep' into 'develop'Alex Gleason
2022-01-01Change concurrent_limiter to Hex PM version 0.1.1Sean King
2021-12-31Merge remote-tracking branch 'origin/develop' into operation-warpsneedAlex Gleason
2021-12-31Merge branch 'erratic-streamer-test' into 'develop'Alex Gleason
2021-12-31StreamerTest: tag erratic testAlex Gleason
2021-12-31AddObjectConcurrentIndexes: add missing object indexAlex Gleason
2021-12-30CombineActivitiesAndObjects: cleanup, add missing indexesAlex Gleason
2021-12-30Merge remote-tracking branch 'origin/develop' into operation-warpsneedAlex Gleason
2021-12-30CombineActivitiesAndObjects: add defaults, and missing indexesAlex Gleason
2021-12-30CombineActivitiesAndObjects: deal with AP ID conflicts differentlyAlex Gleason
2021-12-30CombineActivitiesAndObjects: ON CONFLICT DO NOTHINGAlex Gleason
2021-12-30Merge branch 'more-efficient-ci' into 'develop'lain
2021-12-29HashtagsTableMigrator: fix on_conflictAlex Gleason
2021-12-29LegacyActivity: fix queryAlex Gleason
2021-12-29Add LegacyActivity module for old migrationsAlex Gleason