summaryrefslogtreecommitdiffstats
path: root/web/react/utils/emoticons.jsx
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #982 from hmhealey/plt547Harrison Healey2015-10-081-24/+24
|\
| * Fixed parsing of :'( emoticonhmhealey2015-10-081-1/+1
| * Changed emoticons so that they much be surrounded by whitespacehmhealey2015-10-081-24/+24
| * Switched :p emoticonhmhealey2015-10-081-1/+1
* | Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-081-1/+1
|/
* Removed smilies that start with a semicolonhmhealey2015-09-241-4/+3
* Restored changes which remove emojify and switch to our own versionhmhealey2015-09-221-0/+159
* Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ...Christopher Speller2015-09-221-159/+0
* Added parsing for named emojis to TextFormatting and removed dependency on em...hmhealey2015-09-221-0/+159