commit: cee0d35566974c135d337d6fc5aed9a59d34467c parent: b9497ead3513ba3b93e9a4549e482f4a720aa83d Author: kaniini <ariadne@dereferenced.org> Date: Sun, 4 Aug 2019 04:32:45 +0000 Merge branch 'remove-longfox-emoji-set' into 'develop' Remove longfox emoji set See merge request pleroma/pleroma!1525Diffstat:
30 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -76,6 +76,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - RichMedia: parsers and their order are configured in `rich_media` config. - RichMedia: add the rich media ttl based on image expiration time. +### Removed +- Emoji: Remove longfox emojis. + ## [1.0.1] - 2019-07-14 ### Security - OStatus: fix an object spoofing vulnerability. diff --git a/config/emoji.txt b/config/emoji.txt @@ -1,30 +1,2 @@ firefox, /emoji/Firefox.gif, Gif,Fun blank, /emoji/blank.png, Fun -f_00b, /emoji/f_00b.png -f_00b11b, /emoji/f_00b11b.png -f_00b33b, /emoji/f_00b33b.png -f_00h, /emoji/f_00h.png -f_00t, /emoji/f_00t.png -f_01b, /emoji/f_01b.png -f_03b, /emoji/f_03b.png -f_10b, /emoji/f_10b.png -f_11b, /emoji/f_11b.png -f_11b00b, /emoji/f_11b00b.png -f_11b22b, /emoji/f_11b22b.png -f_11h, /emoji/f_11h.png -f_11t, /emoji/f_11t.png -f_12b, /emoji/f_12b.png -f_21b, /emoji/f_21b.png -f_22b, /emoji/f_22b.png -f_22b11b, /emoji/f_22b11b.png -f_22b33b, /emoji/f_22b33b.png -f_22h, /emoji/f_22h.png -f_22t, /emoji/f_22t.png -f_23b, /emoji/f_23b.png -f_30b, /emoji/f_30b.png -f_32b, /emoji/f_32b.png -f_33b, /emoji/f_33b.png -f_33b00b, /emoji/f_33b00b.png -f_33b22b, /emoji/f_33b22b.png -f_33h, /emoji/f_33h.png -f_33t, /emoji/f_33t.png diff --git a/priv/static/emoji/f_00b.png b/priv/static/emoji/f_00b.png Binary files differ. diff --git a/priv/static/emoji/f_00b11b.png b/priv/static/emoji/f_00b11b.png Binary files differ. diff --git a/priv/static/emoji/f_00b33b.png b/priv/static/emoji/f_00b33b.png Binary files differ. diff --git a/priv/static/emoji/f_00h.png b/priv/static/emoji/f_00h.png Binary files differ. diff --git a/priv/static/emoji/f_00t.png b/priv/static/emoji/f_00t.png Binary files differ. diff --git a/priv/static/emoji/f_01b.png b/priv/static/emoji/f_01b.png Binary files differ. diff --git a/priv/static/emoji/f_03b.png b/priv/static/emoji/f_03b.png Binary files differ. diff --git a/priv/static/emoji/f_10b.png b/priv/static/emoji/f_10b.png Binary files differ. diff --git a/priv/static/emoji/f_11b.png b/priv/static/emoji/f_11b.png Binary files differ. diff --git a/priv/static/emoji/f_11b00b.png b/priv/static/emoji/f_11b00b.png Binary files differ. diff --git a/priv/static/emoji/f_11b22b.png b/priv/static/emoji/f_11b22b.png Binary files differ. diff --git a/priv/static/emoji/f_11h.png b/priv/static/emoji/f_11h.png Binary files differ. diff --git a/priv/static/emoji/f_11t.png b/priv/static/emoji/f_11t.png Binary files differ. diff --git a/priv/static/emoji/f_12b.png b/priv/static/emoji/f_12b.png Binary files differ. diff --git a/priv/static/emoji/f_21b.png b/priv/static/emoji/f_21b.png Binary files differ. diff --git a/priv/static/emoji/f_22b.png b/priv/static/emoji/f_22b.png Binary files differ. diff --git a/priv/static/emoji/f_22b11b.png b/priv/static/emoji/f_22b11b.png Binary files differ. diff --git a/priv/static/emoji/f_22b33b.png b/priv/static/emoji/f_22b33b.png Binary files differ. diff --git a/priv/static/emoji/f_22h.png b/priv/static/emoji/f_22h.png Binary files differ. diff --git a/priv/static/emoji/f_22t.png b/priv/static/emoji/f_22t.png Binary files differ. diff --git a/priv/static/emoji/f_23b.png b/priv/static/emoji/f_23b.png Binary files differ. diff --git a/priv/static/emoji/f_30b.png b/priv/static/emoji/f_30b.png Binary files differ. diff --git a/priv/static/emoji/f_32b.png b/priv/static/emoji/f_32b.png Binary files differ. diff --git a/priv/static/emoji/f_33b.png b/priv/static/emoji/f_33b.png Binary files differ. diff --git a/priv/static/emoji/f_33b00b.png b/priv/static/emoji/f_33b00b.png Binary files differ. diff --git a/priv/static/emoji/f_33b22b.png b/priv/static/emoji/f_33b22b.png Binary files differ. diff --git a/priv/static/emoji/f_33h.png b/priv/static/emoji/f_33h.png Binary files differ. diff --git a/priv/static/emoji/f_33t.png b/priv/static/emoji/f_33t.png Binary files differ.