Commit graph

75 commits

Author SHA1 Message Date
sadposter
763d2c0ce4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-08-13 20:15:30 +01:00
HJ
b9d1ecec44 Merge branch 'stylelint-rscss-1' into 'develop'
Stylelint + RSCSS initial approach

See merge request pleroma/pleroma-fe!1205
2020-08-06 13:38:07 +00:00
Henry Jameson
65b6e23c00 refactor status 2020-07-28 01:27:11 +03:00
eugenijm
222ad2dd50 Make the single line mode is consistent with status-content line height 2020-07-23 16:39:01 +03:00
sadposter
6f621dd34c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-07-10 11:27:53 +01:00
sadposter
954d5c05df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-07-09 22:32:18 +01:00
eugenijm
3b2dfcaf5c Add the single-line prop to StatusContent and use it for chat list items 2020-07-08 15:21:31 +03:00
eugenijm
aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Shpuld Shpuldson
97c62587d0 remove console log 2020-07-07 11:34:40 +03:00
Shpuld Shpuldson
e3991db5c4 fix conflicts and add error handling to media descriptions 2020-07-07 10:01:37 +03:00
Shpuld Shpuldson
87b5f828d7 fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts 2020-07-06 14:01:03 +03:00
Shpuld Shpuldson
afdc3f96f0 fix conflicts, make subject update the preview 2020-07-06 10:45:47 +03:00
Shpuld Shpuldson
61f34ff361 remove panel-footer in userpanel, simplify preview header, fix word-wrap in preview 2020-06-28 16:40:39 +03:00
Shpuld Shpuldson
8c3106c588 Change the show/hide strings about, remove subjected status toggle when 'collapse' option not used 2020-06-26 18:20:32 +03:00
Shpuld Shpuldson
44edb730c1 rip restyle subject, fix some issues with long subject 2020-06-26 14:07:39 +03:00
lain
4da0a0c0bf StatusContent: Fix greentext. 2020-06-19 12:49:42 +02:00
lain
a79bad5cdb StatusContent: Better separate subject from status content. 2020-06-19 12:46:48 +02:00
sadposter
77bd79100b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-06-19 11:01:06 +01:00
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
sadposter
f99240df69 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-06-06 18:30:38 +01:00
lain
d872d55832 StatusContent: Try to get hashtag from dataset first. 2020-06-04 15:50:44 +02:00
sadposter
b4ca079bdb dd nsfw 2020-05-20 17:15:34 +01:00
Shpuld Shpuldson
7a25160ddc Separate status content from status like in direct conversations mr 2020-04-27 12:53:04 +03:00