Commit Graph

5 Commits

Author SHA1 Message Date
Shpuld Shpludson
6343ee929c Merge branch '589-poll-options' into 'develop'
Polls: Construct an html field during normalization.

Closes #589

See merge request pleroma/pleroma-fe!1146
2020-06-18 13:33:00 +00:00
lain
b0b33be9dd Poll, StatusContent: Move emoji css to status body. 2020-06-18 14:41:40 +02:00
Henry Jameson
8cd5041663 add support for defining the greentext 2020-06-13 13:25:56 +03:00
lain
d872d55832 StatusContent: Try to get hashtag from dataset first. 2020-06-04 15:50:44 +02:00
Shpuld Shpuldson
7a25160ddc Separate status content from status like in direct conversations mr 2020-04-27 12:53:04 +03:00