25 commits

Author	SHA1	Message	Date
Jeff Atwood	cf73ee85cd	updated EmojiOne	2014-09-25 12:29:33 -07:00
Régis Hanol	da91ab25cf	Merge pull request #2804 from lidel/plugins-category-in-settings ... UX: Move emoji setting into 'Plugins' category	2014-09-18 11:58:58 -04:00
Robin Ward	d472b4e10a	FIX: When emoji was disabled you could get a JS error in preview	2014-09-17 12:57:49 -04:00
Marcin Rataj	366c9c1baf	UX: Move emoji setting into 'Plugins' category	2014-09-16 23:57:54 +02:00
Régis Hanol	4e5e7d718e	TRIVIAL: remove useless comment	2014-09-15 18:33:05 -04:00
Régis Hanol	205d61363d	FEATURE: add 'enable_emoji' site setting	2014-09-15 18:16:19 -04:00
Sam	97c44469fe	Update emoji.js.erb ... bump version	2014-09-10 17:30:20 +10:00
Jeff Atwood	e5de31bbed	proper switch to emojione for emojis	2014-09-09 23:59:34 -07:00
Sam	03df9a80ea	revert emoji change	2014-09-10 16:50:58 +10:00
Jeff Atwood	e6c0d42f95	fix up missing emojis due to name mappings	2014-09-09 23:39:49 -07:00
Jeff Atwood	c1f19ac74a	update to emojione ... http://github.com/ranks/emojione	2014-09-09 23:02:00 -07:00
Robin Ward	965ff51efe	FIX: Better boundary checking for emoji	2014-08-27 14:40:29 -04:00
Robin Ward	54ea14323a	FIX: Allow emoji at the beginning of a line without a paragraph break.	2014-08-11 12:46:15 -04:00
Robin Ward	fc1ce96dbb	FIX: Change the approach to sanitization. Includes a more detailed API ... for allowing classes and attributes for only certain tag names.	2014-07-03 16:55:36 -04:00
Robin Ward	39c2c958e6	ES6: ComposerView	2014-06-24 16:53:10 -04:00
Robin Ward	a63ac64931	FIX: Obscure emoji fail with a colon surrounded by spaces	2014-06-09 14:44:34 -04:00
Robin Ward	d46fc79344	FIX: winky emoticons were matching with non-spaces before them.	2014-06-04 15:48:27 -04:00
Robin Ward	512746b436	Revert "Revert "FIX: Don't allow mid word emoticons"" ... This reverts commit efaa066a17.	2014-04-01 11:00:51 -04:00
Robin Ward	efaa066a17	Revert "FIX: Don't allow mid word emoticons" ... This reverts commit 65efb8d83f.	2014-03-31 18:29:26 -04:00
Robin Ward	65efb8d83f	FIX: Don't allow mid word emoticons	2014-03-31 17:58:51 -04:00
Sam	a5e3e9ae2a	Added markov emoji for turtle rock	2014-02-18 14:10:03 +11:00
Robin Ward	7fb1b4dded	FIX: Can do multiple :) emojis on one line	2014-01-21 13:33:19 -05:00
Régis Hanol	1457a3792d	that fix should have been in the emoji plugin	2013-12-12 16:42:27 +01:00
Kane York	49d7e55352	Change :D to map to 😃 instead of 😁 ... Because 😁 looks like somebody is constipated, really	2013-11-26 13:34:44 -08:00
Sam	8278fdb9dd	relocate emoji plugin, stop pre-compiling assets	2013-11-20 14:38:21 +11:00