1
0
mirror of https://github.com/twitter/twemoji.git synced 2024-11-20 05:14:09 +00:00
Commit Graph

263 Commits

Author SHA1 Message Date
Andrea Giammarchi
3457dce79b Merge pull request #121 from twuttke/fix_diversity_regex
fix skin tone regex
2016-03-01 07:59:13 +00:00
Tom Wuttke
07fbd9b2d2 fix tests 2016-02-29 21:25:44 -08:00
Tom Wuttke
7dc589dd7c fix skin tone regex 2016-02-29 21:09:31 -08:00
Andrea Giammarchi
040b383a17 fixed generate problem 2016-02-29 13:45:53 +00:00
Andrea Giammarchi
1720e9b22f added previews 2016-02-29 13:36:17 +00:00
Andrea Giammarchi
b53af0264a added new assets folder 2016-02-29 13:24:47 +00:00
Andrea Giammarchi
98374f5acd Merge pull request #120 from twuttke/new_assets_for_twemoji_2
New assets for twemoji 2
2016-02-29 11:20:42 +00:00
Tom Wuttke
66af974c79 Handle diversity and zwj sequences 2016-02-29 00:32:26 -08:00
Tom Wuttke
6b9202d9f7 Add new assets 2016-02-29 00:31:37 -08:00
Andrea Giammarchi
c11b7629fc hopefully fixed travis 2016-02-28 18:22:34 +00:00
Andrea Giammarchi
064f051c95 still trying to fix travis 2016-02-28 17:52:30 +00:00
Andrea Giammarchi
9f6d6492b1 trying to fix travis 2016-02-28 17:42:43 +00:00
Andrea Giammarchi
ed59f2ddfe added tests for version 2 2016-02-28 12:53:01 +00:00
Andrea Giammarchi
fd5a5c2d34 versioned and improved generation process 2016-02-28 11:37:17 +00:00
Andrea Giammarchi
b4bf13ccd6 Merge pull request #118 from pra85/patch-1
Fix a typo
2016-02-12 10:00:01 +00:00
Prayag Verma
c539f67b2b Fix a typo
`costy` → `costly`
2016-02-12 13:39:08 +05:30
Andrea Giammarchi
38c90e7a5d Merge pull request #117 from anirvan/patch-1
Fix grammar in README.md
2016-02-09 08:29:57 +00:00
Anirvan Chatterjee
f5a4fb0820 Fix grammar in README.md
"gap due DOM operations" -> "gap due to DOM operations"
2016-02-08 19:40:43 -08:00
Frédéric Druilhet
b706d24b8b Added project FrwTwemoji 2016-02-08 11:37:15 +01:00
webreflection
685ed18255 trying to migrate to containers 2015-12-11 12:42:27 +00:00
webreflection
f846efdf5d trying to fix travis-ci 2015-12-11 12:40:56 +00:00
webreflection
493cc8117d updating travis 2015-12-11 12:35:51 +00:00
Andrea Giammarchi
10144dce98 Merge pull request #106 from yoavst/gh-pages
thanks
2015-12-11 12:11:33 +00:00
Yoav Sternberg
b97387c288 Add community project 2015-12-11 13:53:29 +02:00
Andrea Giammarchi
f9a6c51438 Merge pull request #101 from JuanitoFatas/doc-add-ruby-twemoji
Add jollygoodcode/twemoji to community projects. [ci skip]
2015-11-30 13:43:31 +01:00
JuanitoFatas
8bd0c8a1aa Add jollygoodcode/twemoji to community projects. [ci skip] 2015-11-28 16:15:54 +08:00
webreflection
f249ba9edd added onerror option and test 2015-11-17 11:12:53 +00:00
webreflection
e436f75780 fixed problems with bower 2015-11-16 08:58:52 +00:00
Andrea Giammarchi
9dcb7942ca Merge pull request #89 from prdolmos/use-consistent-keypad-ten-color
Use the same background color on all keycap digits
2015-06-30 15:16:30 +01:00
Pablo D. Olmos
4bd33b8b6c use the same background color on all keypad digits 2015-06-30 14:52:43 +02:00
WebReflection
e46f00047e fixed the 1f515.svg one 2015-06-29 17:01:40 +01:00
Andrea Giammarchi
99899025a2 Merge pull request #88 from prdolmos/fix-bookmark
[1f516] Remove unnecessary layer
2015-06-29 16:30:49 +01:00
Pablo D. Olmos
e539c88543 [1f516] remove unnecessary layer 2015-06-29 16:10:45 +02:00
Andrea Giammarchi
3c0c13d3a5 excluding nodeType 1 SVG elements too 2015-06-17 10:01:12 +01:00
Andrea Giammarchi
f5ca4f51f9 Merge pull request #85 from kkirsche/patch-1
Remove moot `version` property from bower.json
2015-06-11 09:19:49 +02:00
Kevin Kirsche
3ceb8b884d Remove moot version property from bower.json
Per bower/bower.json-spec@a325da3
2015-06-10 20:39:54 -04:00
Andrea Giammarchi
3e21d10e5a updated both package.json annd bower version to 1.4.1 2015-04-23 09:16:04 +01:00
Andrea Giammarchi
517c2ba84e updated bower version 2015-04-23 09:11:11 +01:00
Andrea Giammarchi
695d863b3d Merge pull request #74 from AnSavvides/patch-1
Add cdnjs option too
2015-04-14 12:48:29 +01:00
Andreas Savvides
5a04e248f6 Add cdnjs option too
`cdnjs` is widely used so it's probably a good idea to mention it too for those that have a preference :)
2015-04-13 18:00:09 +01:00
Andrea Giammarchi
398533a464 Merge pull request #73 from twitter/derekmooney-gh-pages
Derekmooney gh pages
2015-04-11 19:18:21 +01:00
Andrea Giammarchi
ca1c298ddd made consistent with already used style 2015-04-11 18:09:02 +01:00
Derek Mooney
226e5ac6d5 Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Conflicts:
	twemoji.min.js
2015-04-11 09:59:11 -04:00
Derek Mooney
5d4f6fabca Finish up attributes 2015-04-11 09:49:52 -04:00
Andrea Giammarchi
b3d9b74ced re-exported 1f601.svg 2015-04-09 17:00:35 +01:00
Andrea Giammarchi
2b569b5f0e Merge pull request #69 from twitter/fix/grinning-teeth
Fix issue with teeth looking offset on grinning face.
2015-04-09 13:43:58 +01:00
Joen Asmussen
9df390aa66 Fix issue with teeth looking offset on grinning face. 2015-04-09 14:34:58 +02:00
Andrea Giammarchi
0520260c3a Merge pull request #67 from twitter/add/missing-emoji-1f641-1f642
Add missing emoji, 1f641 and 1f642 - Please note this is **asssets** only, library needs all PNGs and SVGs to be exported too
2015-04-09 12:32:25 +01:00
Andrea Giammarchi
8e58ae4745 fixed SVG smiles face alignment 2015-04-09 11:57:30 +01:00
Andrea Giammarchi
974c86d072 Merge pull request #66 from twitter/bug/consistent-face-sizes
Make size and position of face emoji more consistent
2015-04-09 11:29:43 +01:00