100 Commits
Author SHA1 Message Date
Arvid AnderssonandGitHub c59bf0aad0 Merge pull request #387 from zzemla/master
Add Kanban Tool to the list of sites supporting Emoji.
2016-07-02 21:10:48 +02:00
Arvid AnderssonandGitHub 024acb0b28 Merge pull request #386 from onmyway133/patch-1
Update Swift library
2016-06-15 10:33:51 +02:00
Arvid AnderssonandGitHub 9cad9f8948 Merge pull request #385 from marcobiedermann/feature/images
Feature: Optimize Images
2016-06-14 11:10:30 +02:00
Arvid AnderssonandGitHub e182a3d474 Merge pull request #383 from stephenpcook/alt-symbols
Add alternative names for symbols
2016-06-13 08:53:56 +02:00
Arvid AnderssonandGitHub ee4ac8f925 Merge pull request #382 from JuanitoFatas/add-twemoji
Add https://github.com/jollygoodcode/twemoji
2016-06-12 20:50:45 +02:00
Arvid AnderssonandGitHub 838a680516 Merge pull request #377 from onmyway133/patch-1
Add Emoji in Omnia
2016-06-12 09:15:13 +02:00
Arvid AnderssonandGitHub b91902b157 Merge pull request #373 from meeks16/master
Added synonyms in Index
2016-06-12 09:14:46 +02:00
Arvid AnderssonandGitHub 7caa715008 Merge pull request #372 from donderme/patch-1
Update index.html
2016-06-12 09:14:13 +02:00
Arvid AnderssonandGitHub e75f519e47 Merge pull request #375 from Nikitaw99/feature/add-habitica-to-pages
Add habitica to pages list
2016-06-12 09:13:04 +02:00
Arvid AnderssonandGitHub e76c7c0682 Merge pull request #374 from ID25/patch-1
Add rails emoji picker gem for ruby on rails
2016-06-12 09:11:40 +02:00
Arvid AnderssonandGitHub 508d1668e5 Merge pull request #381 from fybwid/fybwid-data-alternative-name
Add data alternative name
2016-06-12 09:11:03 +02:00
Arvid AnderssonandGitHub 8dc1b66df2 Merge pull request #361 from mattmarillac/master
added simple_smile emoticon
2016-06-12 09:09:22 +02:00
Arvid Andersson 75049bf770 Temp fix to get ZeroClipboard working
It looks like it can't be loaded from cdnjs in later Chrome versions.
https://github.com/zeroclipboard/zeroclipboard/issues/632

The long term fix is to use something else to get copy to work. SWF
doesn't really feel like the future ;)

Ref #371
2016-06-12 07:52:00 +02:00
Arvid Andersson 5b9456142d Merge pull request #369 from lazy-sunshine/patch-1
Update index.html
2016-03-29 08:51:49 +02:00
Arvid Andersson 7e3a9aae08 Merge pull request #366 from markseu/master
Added Yellow CMS
2016-03-16 08:07:50 +01:00
Arvid Andersson 7281c35cad Merge pull request #365 from oscarb-se/synonyms
Added synonyms for monkey
2016-03-15 20:42:56 +01:00
Arvid Andersson 3f94eb7cf4 Merge pull request #356 from jhogoforbroke/master
updating for kadan link
2016-03-15 20:34:30 +01:00
Arvid Andersson 9cd5835b58 Merge pull request #355 from harianus/patch-1
Female gays are also named lesbians
2016-03-15 20:34:05 +01:00
Arvid Andersson 41c5fef2da Merge pull request #350 from vrenjith/patch-1
Update README.md
2016-03-15 20:33:33 +01:00
Arvid Andersson 50382ff8a8 Merge pull request #348 from ChipWolf/master
plug.dj shut down
2016-01-15 10:47:27 +01:00
Arvid Andersson 89d8f20318 Merge pull request #339 from Awilum/patch-1
Morfy also uses emoji as plugin
2015-12-03 17:31:21 +01:00
Arvid Andersson 2419c9fae2 Merge pull request #342 from Awilum/master
Added Morfy to public/index.html
2015-12-03 10:57:28 +01:00
Arvid Andersson d53da49f84 Merge pull request #341 from kodie/master
Added a ton of alternative names/keywords from the emojilib repo
2015-12-02 20:06:12 +01:00
Arvid Andersson cba60b0e75 Merge pull request #340 from chadoh/patch-1
Remove duplicate 8ball declaration
2015-12-02 19:41:10 +01:00
Arvid Andersson 987ed69534 Merge pull request #335 from LEOXDmtar/master
added YouTube
2015-12-02 19:39:24 +01:00
Arvid Andersson d636aff027 Flash is a name 2015-11-19 07:54:42 +01:00
Arvid Andersson 683de95028 More subtle notice 2015-11-19 07:52:45 +01:00
Arvid Andersson 290c51f476 Copy copy & cache invalidator 2015-11-19 07:52:45 +01:00
Arvid Andersson 95ea092742 Load ZeroClipboard from CDNJS 2015-11-19 07:52:44 +01:00
Arvid Andersson d8ff647ac0 Delete index.html~ 2015-11-18 17:18:49 +01:00
Arvid Andersson 76164eaa4d Merge branch 'codirt-master' 2015-11-18 16:54:58 +01:00
Arvid Andersson 98047c38d5 Merge branch 'master' of https://github.com/codirt/emoji-cheat-sheet.com into codirt-master 2015-11-18 16:54:46 +01:00
Arvid Andersson 5a6432b115 Merge branch 'raychung02-raychung02-patch-2' 2015-11-18 16:50:46 +01:00
Arvid Andersson 510f4eb490 Merge branch 'raychung02-patch-2' of https://github.com/raychung02/emoji-cheat-sheet.com into raychung02-raychung02-patch-2 2015-11-18 16:50:37 +01:00
Arvid Andersson 674dc98bca Merge pull request #321 from sanspace/suggest-eyes-synonym
Add synonym for eyes: eye-rolling
2015-11-18 16:32:55 +01:00
Arvid Andersson a6f5eecbd1 Merge pull request #333 from ohbarye/remove-out-of-place-string
Remove out of place string
2015-11-09 09:35:05 +01:00
Arvid Andersson 8e884f2851 Merge pull request #278 from alexchantastic/patch-1
Added synonyms for :neckbeard:
2015-11-05 21:37:38 +01:00
Arvid Andersson ec0126ec31 Merge pull request #329 from Sinzio/patch-5
Update index.html
2015-11-05 20:35:02 +01:00
Arvid Andersson 99e017d951 Merge pull request #327 from Sinzio/patch-3
Update index.html
2015-11-05 20:34:46 +01:00
Arvid Andersson 40d0d80dd6 Merge pull request #326 from Sinzio/patch-2
Update index.html
2015-11-05 20:34:28 +01:00
Arvid Andersson 5521e75526 Merge pull request #325 from Sinzio/patch-1
Update index.html
2015-11-05 20:34:12 +01:00
Arvid Andersson 41eb9d9587 Merge pull request #324 from sjs7007/master
added description for skull emoji
2015-11-05 20:33:58 +01:00
Arvid Andersson 356ee7f41d Merge pull request #318 from lurkingh/master
Old man/woman
2015-11-05 20:32:47 +01:00
Arvid Andersson b64d3a6d6b Merge pull request #314 from Wishful2/master
Added alternative name
2015-11-05 20:20:57 +01:00
Arvid Andersson 2249508b80 Merge pull request #312 from snoopyq/master
Additional pinyin entries
2015-11-05 20:15:38 +01:00
Arvid Andersson 48c8535fd1 Merge pull request #311 from laurskies/my-new-feature
Add more synonyms
2015-11-05 20:14:18 +01:00
Arvid Andersson 049c43482a Merge pull request #307 from skitau/patch-2
Update index.html
2015-11-05 20:13:32 +01:00
Arvid Andersson cafc0abf3e Merge pull request #306 from skitau/patch-1
Update index.html
2015-11-05 20:13:05 +01:00
Arvid Andersson 723edfa140 Merge pull request #303 from Maylort/patch-1
Update index.html
2015-11-05 20:11:41 +01:00
Arvid Andersson 84b4e9c6c9 Merge pull request #301 from NextLevelWeirdo/patch-3
Update index.html
2015-11-05 20:11:11 +01:00
Arvid Andersson 008c46384d Merge pull request #283 from MishaLarionov/patch-2
Made the license easier to read and understand
2015-11-05 20:02:22 +01:00
Arvid Andersson fc5143b841 Merge pull request #300 from NextLevelWeirdo/patch-2
Update index.html
2015-10-30 10:19:00 +01:00
Arvid Andersson e1245e1324 Merge pull request #298 from codename13/patch-1
Added miscellaneous food-related tags
2015-10-30 10:18:25 +01:00
Arvid Andersson 52374fc211 Merge pull request #297 from cyturralde/patch-7
Update index.html
2015-10-30 10:17:24 +01:00
Arvid Andersson 231e39b61f Merge pull request #299 from NextLevelWeirdo/patch-1
Update index.html
2015-10-30 10:16:49 +01:00
Arvid Andersson 6f96bb48a5 Merge pull request #296 from cyturralde/patch-6
Update index.html
2015-10-30 10:16:34 +01:00
Arvid Andersson b0688b6316 Merge pull request #295 from cyturralde/patch-5
Update index.html
2015-10-30 10:16:17 +01:00
Arvid Andersson fb627c236b Merge pull request #294 from cyturralde/patch-4
Update index.html
2015-10-30 10:15:54 +01:00
Arvid Andersson 9989fd70e4 Merge pull request #293 from cyturralde/patch-3
Update index.html
2015-10-30 10:15:23 +01:00
Arvid Andersson ffc800558e Merge pull request #292 from cyturralde/patch-2
Update index.html
2015-10-30 10:15:03 +01:00
Arvid Andersson 6fc2b30798 Merge pull request #291 from johnpaul91/johnpaul91-moresynonyms
moresynonyms
2015-10-30 10:14:35 +01:00
Arvid Andersson e42bcba89b Merge pull request #290 from johnpaul91/master
Added synonyms for sound
2015-10-30 10:14:08 +01:00
Arvid Andersson cb53083796 Merge pull request #289 from SimoneNigro/master
added alternative description for smiley and smile
2015-10-30 10:13:46 +01:00
Arvid Andersson 158883b1d7 Merge pull request #288 from snoopyq/master
Ying & Wari
2015-10-30 10:13:11 +01:00
Arvid Andersson 45c4b3a1b8 Merge pull request #282 from MishaLarionov/patch-1
Added "happy" alternate name to "joy" emoji
2015-10-29 07:27:28 +01:00
Arvid Andersson 63d5c10240 Merge pull request #284 from otep/master
Added synonyms for alcoholic drinks and monetary icons.
2015-10-29 07:27:05 +01:00
Arvid Andersson 0df8c5ac61 Merge pull request #285 from fahrielle/master
added more tags for smiley cats
2015-10-29 07:25:54 +01:00
Arvid Andersson 2bd702404f Merge pull request #274 from dsg2806/master
Synonyms
2015-10-28 21:13:28 +01:00
Arvid Andersson ded113e8ab Merge pull request #279 from alexchantastic/patch-2
Added synonym for 👽
2015-10-28 21:10:13 +01:00
Arvid Andersson 747f4b91cd Merge pull request #275 from Dubyah/README-fix
Update README.md, minor grammar fix
2015-10-28 21:08:50 +01:00
Arvid Andersson f81a634aff Merge pull request #271 from randomization/master
alternative name television
2015-10-28 21:06:09 +01:00
Arvid Andersson 3edc5e696e Merge pull request #270 from MCDonders/patch-1
Update index.html
2015-10-28 21:05:43 +01:00
Arvid Andersson bf0cf3bd4a Merge pull request #269 from vnmbxx/master
Update README.md
2015-10-28 21:05:18 +01:00
Arvid Andersson 648921e439 Merge pull request #268 from Staplerfruit/patch-1
Synonym 8ball>magic_ball
2015-10-28 21:04:56 +01:00
Arvid Andersson 2ed74ce48d Merge pull request #267 from lhassan18/my-new-feature
New Tags
2015-10-28 21:04:34 +01:00
Arvid Andersson 6db0b48d8e Merge pull request #266 from Smoseph/master
Added flirt as a synonym for wink
2015-10-28 21:01:41 +01:00
Arvid Andersson 8e67f01245 Merge pull request #265 from Chingling/master
Update index.html
2015-10-28 21:00:56 +01:00
Arvid Andersson 7eee4ffb8d Merge pull request #258 from hammo/master
Added a few alternative names
2015-10-28 20:59:00 +01:00
Arvid Andersson cabe1c27b5 Merge pull request #256 from KillerFan/git-push-origin-vehicles-car
git commit -am Added vehicle alternative names
2015-10-28 20:58:11 +01:00
Arvid Andersson 2cb1e5f508 Merge pull request #255 from itsaferbie/master
Added two alternatives for fearful
2015-10-28 20:57:42 +01:00
Arvid Andersson b7d0f36b9a Update used gems 2015-10-20 08:10:37 +02:00
Arvid Andersson 594c11ea80 House keeping
* Basecamp instead of campfire in title
* Description SEO optimization
* Footer copy is more correct
2015-10-20 08:08:50 +02:00
Arvid Andersson 33dd1ed522 Merge pull request #251 from MadLittleMods/add-gitter-emoji-support-list
Add Gitter to list of emoji supporting apps
2015-10-20 08:07:33 +02:00
Arvid Andersson 692b1df6bf Merge pull request #250 from kachick/naruto
Add an alias for fish_cake that called "Naruto" in Japan
2015-10-16 16:12:32 +02:00
Arvid Andersson 031943d968 Merge pull request #248 from mark-adams/add-bitbucket
Added Bitbucket to the list of sites supporting emoji
2015-10-13 09:31:48 +02:00
Arvid Andersson e32f5d2a69 Merge pull request #234 from yuyokk/fix-mobile-view
Prevent horizontal scrolling on mobile devices
2015-10-04 16:03:07 +02:00
Arvid Andersson 9a517afbe7 Merge pull request #242 from kachick/fix-readme
Update and freeze the example link to `data-alternative-name`
2015-10-04 15:54:05 +02:00
Arvid Andersson ed03e5af22 Merge pull request #246 from kachick/aliases-floral
Add aliases for floral objects
2015-10-04 15:53:22 +02:00
Arvid Andersson 9ab735bdae Merge pull request #245 from kachick/aliases-suit
Add aliases for card suit
2015-10-04 15:52:52 +02:00
Arvid Andersson 63648dc190 Merge pull request #244 from kachick/aliases-sport
Add aliases for running is a sport
2015-10-04 15:51:42 +02:00
Arvid Andersson 5dd715249f Merge pull request #243 from kachick/japanese-goblins
Add aliases for Japanese goblins (`⊇`)
2015-10-04 15:51:16 +02:00
Arvid Andersson f8e4a0bf62 Merge pull request #241 from 8012labs/add-app-status-hero
Add Status Hero to the list of Emoji-supported apps
2015-09-14 09:14:05 +02:00
Arvid Andersson 25c7859c95 Merge pull request #236 from teamvista/Add_App-discord
Adds Discord to the list of Emoji-supported apps.
2015-08-28 12:23:58 +02:00
Arvid Andersson fa9f0951b6 Merge pull request #231 from tuxlife/patch-1
other Line with data-alternative-name
2015-07-13 19:54:40 +02:00
Arvid Andersson e4e4d82210 Usersnap support emojis 2015-06-21 21:20:51 +02:00
Arvid Andersson d50f9f4b8b Merge branch 'florianmonfort-master'
Conflicts:
	README.md
2015-05-19 10:06:31 +02:00
Arvid Andersson 0d9578ffe6 Indent correctly 2015-05-19 10:04:38 +02:00
Arvid Andersson 73f50e786d Merge pull request #226 from squarefractal/patch-1
Add Dokuwiki to the list
2015-05-19 10:01:59 +02:00
Arvid Andersson a8b5161463 Indent correctly 2015-05-11 19:52:55 +02:00
Arvid Andersson 4ac4bf7dd3 Merge pull request #223 from florianmonfort/master
Added ChatGrape to the list of websites that supports emojis
2015-05-11 19:52:08 +02:00