summaryrefslogtreecommitdiffstats
path: root/webapp/images
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-11-30 13:55:49 -0500
committerGitHub <noreply@github.com>2016-11-30 13:55:49 -0500
commit165ad0d4f791f8ae2109472d8a626d911fa368e0 (patch)
tree29001baf676d7d4ef4cd9462e9f2c6766ed6333a /webapp/images
parent2bf0342d130b3a77c5ed02e98e0857f28a5787f0 (diff)
downloadchat-165ad0d4f791f8ae2109472d8a626d911fa368e0.tar.gz
chat-165ad0d4f791f8ae2109472d8a626d911fa368e0.tar.bz2
chat-165ad0d4f791f8ae2109472d8a626d911fa368e0.zip
PLT-1378 Initial version of emoji reactions (#4520)
* Refactored emoji.json to support multiple aliases and emoji categories * Added custom category to emoji.jsx and stabilized all fields * Removed conflicting aliases for :mattermost: and :ca: * fixup after store changes * Added emoji reactions * Removed reactions for an emoji when that emoji is deleted * Fixed incorrect test case * Renamed ReactionList to ReactionListView * Fixed :+1: and :-1: not showing up as possible reactions * Removed text emoticons from emoji reaction autocomplete * Changed emoji reactions to be sorted by the order that they were first created * Set a maximum number of listeners for the ReactionStore * Removed unused code from Textbox component * Fixed reaction permissions * Changed error code when trying to modify reactions for another user * Fixed merge conflicts * Properly applied theme colours to reactions * Fixed ESLint and gofmt errors * Fixed ReactionListContainer to properly update when its post prop changes * Removed unnecessary escape characters from reaction regexes * Shared reaction message pattern between CreatePost and CreateComment * Removed an unnecessary select query when saving a reaction * Changed reactions route to be under /reactions * Fixed copyright dates on newly added files * Removed debug code that prevented all unit tests from being ran * Cleaned up unnecessary code for reactions * Renamed ReactionStore.List to ReactionStore.GetForPost
Diffstat (limited to 'webapp/images')
-rw-r--r--webapp/images/emoji/basecamp.pngbin898 -> 0 bytes
-rw-r--r--webapp/images/emoji/basecampy.pngbin2951 -> 0 bytes
-rw-r--r--webapp/images/emoji/mattermost.png (renamed from webapp/images/emoji/mm.png)bin6576 -> 6576 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/webapp/images/emoji/basecamp.png b/webapp/images/emoji/basecamp.png
deleted file mode 100644
index d0267fb85..000000000
--- a/webapp/images/emoji/basecamp.png
+++ /dev/null
Binary files differ
diff --git a/webapp/images/emoji/basecampy.png b/webapp/images/emoji/basecampy.png
deleted file mode 100644
index 806d013fc..000000000
--- a/webapp/images/emoji/basecampy.png
+++ /dev/null
Binary files differ
diff --git a/webapp/images/emoji/mm.png b/webapp/images/emoji/mattermost.png
index 90930aabe..90930aabe 100644
--- a/webapp/images/emoji/mm.png
+++ b/webapp/images/emoji/mattermost.png
Binary files differ