Commit graph

6 commits

Author SHA1 Message Date
eaa287d39d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth
All checks were successful
continuous-integration/drone/push Build is passing
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2023-01-20 18:24:45 +01:00
e71bf66223
Merge a ton of changes
Do any of them work? probably not.

Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-09-30 17:38:02 +02:00
Tusooa Zhu
d865f572aa
Generate grouped unicode emojis from unicode-emoji-json 2022-09-18 13:19:53 -04:00
Henry Jameson
4eb075fae7 whoopsies 2018-12-11 18:57:24 +03:00
xj9
9107facaca issue #1 - better nsfw image loading
preload the image when it is toggled, but wait to replace it until
it has loaded.
2017-03-02 20:01:19 -07:00
Roger Braun
191c02af1e Basic skeleton 2016-10-26 16:46:32 +02:00