aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/activity/ir
AgeCommit message (Collapse)Author
2020-12-28Revert "Merge branch 'features/hashtag-column' into 'develop'"Haelwenn
This reverts merge request !2824
2020-12-28Pleroma.Object/1: take %Object{} as argument insteadHaelwenn (lanodan) Monnier
2020-12-22Insert text representation of hashtags into object["hashtags"]Haelwenn (lanodan) Monnier
Includes a new mix task: pleroma.database fill_old_hashtags
2020-10-08Remote Timeline: add Streaming supportAlex Gleason
2020-03-13Fix hashtags WebSocket streamingEgor Kislitsyn
2020-03-03Update CopyrightsMark Felder
2019-09-16Revert "Merge branch 'revert-4fabf83a' into 'develop'"Egor Kislitsyn
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
2019-09-16Revert "Merge branch 'streamer-refactoring' into 'develop'"kaniini
This reverts merge request !1653
2019-09-16Streamer refactoringSteven Fuchs