Commit Graph
628 Commits
Author SHA1 Message Date
Arvid Andersson 50382ff8a8 Merge pull request #348 from ChipWolf/master
plug.dj shut down
2016-01-15 10:47:27 +01:00
Chip ‮♥ f33c612b37 plug.dj shut down 2015-12-18 14:24:05 +00:00
Chip ‮♥ d130419d79 plug.dj shut down 2015-12-18 14:22:54 +00: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
Sergey Romanenko 2d9f413e27 Update index.html 2015-12-03 09:13:07 +03: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
Kodie Grantham 4fd9f61bc0 Changes with updates from upstream 2015-12-02 12:53:57 -06: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
Kodie Grantham 682e4fc811 Added a ton of alternative names/keywords from the emojilib repo 2015-12-02 11:39:49 -06:00
Chad Ostrowski cbe5ae3b59 Remove duplicate 8ball declaration
The 8ball is listed twice!

Maybe there's supposed to be some other sport ball that goes here, I'm not sure.
2015-11-27 08:50:11 -05:00
Sergey Romanenko 5c96464c5f Morfy also uses emoji as plugin 2015-11-27 13:02:02 +03: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
Christoph KisfeldandArvid Andersson c3c9c54118 Remove console.log 2015-11-19 07:52:44 +01:00
Christoph KisfeldandArvid Andersson 851172eab1 Code cleanup 2015-11-19 07:52:44 +01:00
Christoph KisfeldandArvid Andersson baf75616ca Javascript copy function #247 2015-11-18 20:44:06 +01:00
Christoph KisfeldandArvid Andersson 30050acc72 Update links and jquery 2015-11-18 20:44:06 +01:00
Christoph KisfeldandArvid Andersson d1f94906f4 Update ZeroClipboard to most recent version 2015-11-18 20:44:06 +01:00
Christoph KisfeldandArvid Andersson f607ab8f90 Remove jnotify in favour of CSS animations 2015-11-18 20:44:05 +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
LEOXDmtar d81ccefd68 added YouTube 2015-11-14 21:19:26 +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
ohbarye 5852849cd2 Remove out of place string 2015-11-07 20:14:53 +09:00
Arvid Andersson 8e884f2851 Merge pull request #278 from alexchantastic/patch-1
Added synonyms for :neckbeard:
2015-11-05 21:37:38 +01:00
Alex ChanandAlex Chan 3653f22b13 Added synonyms for :neckbeard: 2015-11-05 12:30:50 -08: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
Sinzio 77882d129d Update index.html 2015-10-31 16:33:10 +00:00
Sinzio 6f62fe55c7 Update index.html 2015-10-31 16:30:42 +00:00