Commit Graph

676 Commits (e7fd919154d6cae2635133cbeb9480065f05f9ff)

Author SHA1 Message Date
Nolan Lawson e7fd919154 add storybook for issue #313 2019-03-31 09:07:37 -07:00
Etienne Lemay f654ef4050 Update gh-pages 2019-03-28 09:47:48 -04:00
Etienne Lemay 1d09d3758e
Fix changelog link 2019-03-28 09:43:52 -04:00
Etienne Lemay 8d4d928973
Release v2.11.0 2019-03-28 09:41:13 -04:00
Etienne Lemay 5d1b84cf1d
Add CHANGELOG.md 2019-03-28 09:35:40 -04:00
Etienne Lemay 9b3a4487a1
Merge pull request #329 from missive/fix-emoji-button
fix: use span for non-clickable emojis
2019-03-28 09:27:43 -04:00
Etienne Lemay 7f05e22d12
Fix test 2019-03-28 09:16:43 -04:00
Etienne Lemay 32282a6dc7
Fix prettier 2019-03-28 09:14:25 -04:00
Etienne Lemay 4fda4dcc01 fix: use span for non-clickable emojis 2019-03-28 08:59:19 -04:00
Etienne Lemay abc2cdaf02 Revert "💄"
This reverts commit 1bcc52e587.
2019-03-28 08:56:50 -04:00
Etienne Lemay 1bcc52e587
💄 2019-03-28 08:22:30 -04:00
Etienne Lemay 5f065d4793
Merge pull request #316 from nolanlawson/nolan/fix-tests-ci
docs: fix travis CI badge
2019-03-28 07:38:55 -04:00
Etienne Lemay cbad12426c
Merge pull request #317 from nolanlawson/nolan/308-addendum
fix: consistently return short_names from sanitize
2019-03-28 07:37:39 -04:00
Nolan Lawson 7a94080f5f
Merge pull request #323 from missive/nolan/hinaloe-test
test: add test for short_names in custom emoji
2019-03-23 15:06:35 -07:00
Nolan Lawson 7039517939 remove code comment 2019-03-23 15:06:13 -07:00
Nolan Lawson 7d8e2458d9
Merge pull request #250 from pederjohnsen/get_emoji_data_from_native
Get emoji data from native
2019-03-23 15:04:59 -07:00
Peder Johnsen ab2f6004ac Add tests 2019-03-23 21:31:11 +00:00
Peder Johnsen d140dd8f04 typo 2019-03-23 21:22:14 +00:00
Peder Johnsen 5570a7ce1a Run prettier 2019-03-23 21:15:47 +00:00
Peder Johnsen 5c64cc6908 Use for loop and refactor lookup code 2019-03-23 21:14:52 +00:00
Peder Johnsen 90b36d829f Get skinToneIndex from forEach function 2019-03-23 21:13:02 +00:00
Peder Johnsen 0ab34e20a3 Remove empty strings from skinTones and skinCodes. 2019-03-23 21:12:40 +00:00
Peder Johnsen a8c491273c Merge remote-tracking branch 'emojimart/master' into get_emoji_data_from_native 2019-03-23 20:35:16 +00:00
Nolan Lawson d6598deb2e
Merge pull request #324 from pederjohnsen/fix_typo
Fix typo
2019-03-23 09:58:51 -07:00
Peder Johnsen dce30b3f09 Fix typo 2019-03-23 16:39:40 +00:00
Peder Johnsen 37340679ec Update story/readme 2019-03-23 16:29:17 +00:00
Hinaloe 39fc02bfe3 test: add test for short_names in custom emoji 2019-03-23 09:25:51 -07:00
Nolan Lawson 3c0c0caffc fix: fix prettier 2019-03-23 09:18:50 -07:00
Nolan Lawson d9eda6a7a5
Merge pull request #321 from pederjohnsen/return_skin_emoji_on_search
Return skin emoji on search
2019-03-23 09:18:26 -07:00
Nolan Lawson 43ddfa78ad
Merge pull request #322 from pederjohnsen/patch-1
Add ignore for package-lock.json
2019-03-23 09:14:15 -07:00
Nolan Lawson 5538272c94
Merge pull request #320 from pederjohnsen/editorconfig
Add .editorconfig
2019-03-23 09:13:09 -07:00
Peder Johnsen ed241d1d42 Revert skin tone emoji on search code 2019-03-23 15:34:46 +00:00
Peder Johnsen 236cd3d612
Add ignore for package-lock.json 2019-03-23 15:30:26 +00:00
Peder Johnsen aaa12fe918
Delete package-lock.json 2019-03-23 15:28:52 +00:00
Peder Johnsen 127dea28a5 Use `thumbs` over `christmas` for skin tone search story 2019-03-23 15:24:43 +00:00
Peder Johnsen 88310345d8 Revert 2019-03-23 15:24:22 +00:00
Peder Johnsen e00371c86e Keep new line 2019-03-23 15:20:21 +00:00
Peder Johnsen b76be74e96 Add test 2019-03-23 15:18:26 +00:00
Peder Johnsen ab2f17cfc1 Add story 2019-03-23 15:18:02 +00:00
Peder Johnsen 51a0879ec1 Return emojis with skin tone from store on nimble search 2019-03-23 15:17:37 +00:00
Peder Johnsen 9afc613fee Split out .editorconfig addition into separate PR 2019-03-23 12:00:55 +00:00
Peder Johnsen f1901ed94c Add .editorconfig 2019-03-23 12:00:14 +00:00
Nolan Lawson fa7141653d fix: consistently return short_names from sanitize 2019-03-22 15:59:55 -07:00
Nolan Lawson 6fb9c9afa7 docs: fix travis CI badge 2019-03-22 15:49:44 -07:00
Nolan Lawson 8bea0331ff
Merge pull request #306 from nolanlawson/nolan/ci-tests
chore: add Travis CI tests
2019-03-22 07:42:45 -07:00
Nolan Lawson 290f442daa
Merge pull request #308 from hinaloe/fix/crash-short_name
keep short_names on sanitize
2019-03-22 07:42:21 -07:00
Nolan Lawson e17b7b9fcd
Merge pull request #307 from nolanlawson/nolan/outside-react
docs: add example of how to use outside React
2019-03-22 07:40:04 -07:00
Peder Johnsen 51d59341c8
Remove duplicate `set` 2019-03-20 11:32:26 +00:00
Peder Johnsen f760c55440 Return skin emojis in search. Refactor getEmojiDataFromNative 2019-03-20 11:25:48 +00:00
Peder Johnsen 22a5ca587f Merge branch 'emojimart' into get_emoji_data_from_native 2019-03-20 09:08:32 +00:00