Commit Graph
474 Commits
Author SHA1 Message Date
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
Henry Poydar e068993fc6 Add Status Hero to the list of Emoji-supported apps 2015-09-13 09:37:34 -04: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
teamvista 951e728e9e Discord supports emoji 2015-08-22 21:59:40 -04:00
teamvista 3f8684e6d9 Update readme to add Discord to the list 2015-08-22 21:57:36 -04: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
Matthias Kerk 84fe43b388 other Line with data-alternative-name 2015-07-13 13:32:37 +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
squarefractalandArvid Andersson 4c1e03ce75 Dokuwiki support 2015-05-19 10:05:20 +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
squarefractal 6605c0321b Dokuwiki support 2015-05-15 15:38:03 +05:30
Florian Monfort 307e69e650 Added changes to Readme 2015-05-12 16:19:18 +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
Florian Monfort e78bd513b1 Changed the indent
Changed the indent line 87
2015-05-11 14:28:03 +02:00
Florian Monfort 713ac8e9e9 added ChatGrape
Added ChatGrape at the right place
2015-05-10 17:37:30 +02:00
Florian Monfort 99306d23eb Corrected indent
Added ChatGrape to the list
2015-05-04 17:30:01 +02:00
Florian Monfort c8fc9f970f Added ChatGrape to the list
Added ChatGrape to the list, sent you an email but learned how to use
GitHub in the mean time lol
2015-05-04 17:00:57 +02:00
Arvid Andersson 7ebaca3d14 Fix typo 2015-04-28 22:05:43 +02:00
Arvid Andersson c1f964ce5b Merge pull request #219 from fotos/crescent_moon
Rename moon to crescent_moon
2015-04-27 22:43:53 +02:00
Arvid Andersson 7c268b24be Merge pull request #222 from Artenes/smileIsHappy
Added data-alternative-name "Happy" and "Relief" to some smile emojis
2015-04-27 22:25:10 +02:00
Artenes Nogueira 91635c780e Added data-alternative-name "Happy" to some smile emojis 2015-04-18 15:50:22 -03:00
Arvid Andersson 71695040f6 Merge pull request #221 from krazyjakee/master
add igdb to emoji users
2015-04-17 10:17:01 +02:00
Jake Cattrall eceb884556 add igdb to emoji users 2015-04-16 09:49:11 +01:00
Arvid Andersson f1b276ed0e Merge pull request #220 from tomer/patch-1
Fix link to index.html demonstrating the usage of data-alternative-name ...
2015-04-09 09:30:59 +02:00
Tomer Cohen 9d2fce7b00 Fix link to index.html demonstrating the usage of data-alternative-name in file README.md 2015-04-09 00:44:11 +03:00
Fotos Georgiadis b797b9e550 Rename moon to crescent_moon 2015-04-03 01:32:31 +03:00
Arvid Andersson 15a6321e10 Merge pull request #217 from buildkite/add-buildkite-to-list
Add Buildkite to list of supported services
2015-03-23 09:57:44 +01:00
Tim Lucas b352452df2 Add Buildkite to list of supported services 2015-03-17 10:26:16 +11:00
Arvid Andersson 6eae55dff8 Merge pull request #213 from sibartlett/master
Added Let's Chat
2015-03-09 09:48:02 +01:00
Arvid Andersson a01bd806ec Merge pull request #214 from stevemao/patch-1
Tweak JavaScript section
2015-03-03 21:56:05 +01:00
Steve Mao 57a2e9c814 Tweak JavaScript section
All of them are available on npm
2015-02-26 16:05:27 +11:00
Simon Bartlett cd0a85b86f Added Let's Chat 2015-02-21 22:17:47 -05:00
Arvid Andersson 4034a99b99 No reflow of text when ad is displayed 2015-02-20 10:19:10 +01:00
Arvid Andersson 096ed015c7 Ad taks up a tiny bit less space 2015-02-19 22:57:01 +01:00
Arvid Andersson 09a284cb8b Merge branch 'ads' 2015-02-19 22:52:36 +01:00
Arvid Andersson 1ef3d6b8ac Test with ads from Carbon
Will run this for a month and see how if feels / works.

More info http://carbonads.net
2015-02-19 22:48:54 +01:00
Arvid Andersson 1a8c48e3e9 Track service link clicks 2015-02-19 22:06:22 +01:00
Arvid Andersson db0a270a18 Correct line number 2015-02-19 21:56:56 +01:00
Arvid Andersson 78bb40944b Merge branch 'simplify-design' 2015-02-19 21:43:29 +01:00
Arvid Andersson 5f964bf65f Simplify design
Basically this make page into a one column layout. This allows
everything to use the full width of the browser widow.

Share buttons on a single line, probably more visible now.

Remove background as it doesn't add much.
2015-02-19 21:38:46 +01:00
Arvid Andersson ca4ceff6b4 Merge pull request #211 from jerone/synonyms
Some synonyms
2015-02-19 10:10:51 +01:00
unknown ae8806ac3d Merge branch 'synonyms' of https://github.com/jerone/emoji-cheat-sheet.com into synonyms
Conflicts:
	public/index.html
2015-02-18 14:26:22 +01:00
Jeroen van Warmerdamandunknown 24d5498e6c Some more synonyms 2015-02-18 14:23:06 +01:00
Jeroen van Warmerdamandunknown aa693493ec Some synonyms 2015-02-18 14:22:55 +01:00
Arvid Andersson c1cbf29259 Merge pull request #210 from delas/master
Added few aliases
2015-02-18 10:08:33 +01:00
Jeroen van Warmerdam 217337d08a Some more synonyms 2015-02-17 17:58:14 +01:00
Jeroen van Warmerdam 08edf4982a Some synonyms 2015-02-17 17:43:59 +01:00