lp:~michael-sheldon/emojione/2.2.4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~phablet-team/emojione/ubuntu at revision 347

Ubuntu Phablet Team: Pending requested 2016-07-04

Diff: 7609 lines (+3568/-1697)

47 files modified

.versions (+30/-30)
README.md (+19/-19)
assets/css/emojione-awesome.css (+590/-2)
assets/fonts/README.md (+2/-2)
assets/other/category_icons/diversity.svg (+30/-0)
assets/other/category_icons/unicode9.svg (+30/-0)
assets/sprites/emojione.sprites.css (+1/-1)
assets/sprites/emojione.sprites.svg (+2/-2)
assets/svg/1f3f3-1f308.svg (+1/-0)
bower.json (+1/-1)
debian/changelog (+6/-1)
demos/alternate-alt-tags.html (+1/-1)
demos/ascii-smileys.html (+2/-2)
demos/autocomplete.html (+5/-5)
demos/class-convert.html (+2/-2)
demos/convert-on-submit.html (+1/-1)
demos/index.html (+1/-1)
demos/jsshortnametoimage.html (+1/-1)
demos/jstoimage.html (+1/-1)
demos/jstoshort.html (+1/-1)
demos/jsunicodetoimage.html (+1/-1)
demos/live-preview.html (+2/-2)
demos/phpshortnametoimage.php (+1/-1)
demos/phptoimage.php (+1/-1)
demos/phptoshort.php (+1/-1)
demos/phpunicodetoimage.php (+1/-1)
demos/shortnametounicode.html (+1/-1)
demos/sprites-png.html (+1/-1)
demos/sprites-svg.html (+1/-1)
emoji.json (+1/-1)
emoji_strategy.json (+1/-1)
lib/android/com/emojione/Emojione.java (+1751/-1554)
lib/emojione-awesome/_emojione-awesome.map.scss (+199/-3)
lib/ios/src/Emojione.m (+200/-3)
lib/js/emojione.js (+9/-9)
lib/js/emojione.min.js (+8/-7)
lib/js/tests/npm-debug.log (+1/-1)
lib/js/tests/tests.html (+11/-11)
lib/js/tests/validate.json (+11/-11)
lib/php/src/Client.php (+1/-1)
lib/php/src/Emojione.php (+1/-1)
lib/php/src/Ruleset.php (+632/-6)
lib/php/test/ConversionTest.php (+1/-1)
lib/php/test/EmojiTest.php (+1/-1)
lib/php/test/EmojioneTest.php (+1/-1)
package.js (+1/-1)
package.json (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1551491: Emoji skin tones are rendered as missing characters

Medium

Fix Released

Link a bug report

Related blueprints

349. By Michael Sheldon on 2016-07-22

Merge from upstream for 2.2.6 release

348. By Michael Sheldon on 2016-07-04

Update version for upstream 2.2.4 release

347. By Michael Sheldon on 2016-07-04

Merge from upstream for 2.2.4 release (includes unicode 9 emoji)

346. By CI Train Bot Account on 2016-06-16

Releasing 2.2.2+16.10.20160616-0ubuntu1

345. By CI Train Bot Account on 2016-06-16

Initial Debian packaging

344. By Michael Sheldon on 2016-06-16

Use whitespace to delimit paths in debian/copyright 'Files' entry

343. By Michael Sheldon on 2016-06-16

Fix debian/copyright licensing details

342. By Michael Sheldon on 2016-06-16

Fix typo in copyright source URL

341. By Michael Sheldon on 2016-06-15

Add initial Debian packaging

340. By Casey A Henson <email address hidden> on 2016-06-14

Merge pull request #265 from miguelsousa/extra-files

remove files of emoji that were not included in Unicode 9.0