From 6fb30b7ca3c80bba70dab5b206df59b088720aca Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 17 Dec 2015 10:02:26 -0800 Subject: [PATCH] v2.0.0 --- LICENSE.md | 6 +- demos/alternate-alt-tags.html | 4 +- demos/ascii-smileys.html | 256 +- demos/autocomplete.html | 8 +- demos/class-convert.html | 4 +- demos/convert-on-submit.html | 4 +- demos/index.html | 4 +- demos/jsshortnametoimage.html | 4 +- demos/jstoimage.html | 4 +- demos/jstoshort.html | 4 +- demos/jsunicodetoimage.html | 4 +- demos/live-preview.html | 4 +- demos/phpshortnametoimage.php | 4 +- demos/phptoimage.php | 4 +- demos/phptoshort.php | 4 +- demos/phpunicodetoimage.php | 4 +- demos/sprites-png.html | 10 +- demos/sprites-svg.html | 8 +- demos/styles/demos.css | 2 +- lib/android/com/emojione/Emojione.java | 1993 ++++---- .../_emojione-awesome.map.scss | 2873 ++++++----- lib/ios/src/Emojione.m | 2823 ++++++----- lib/js/.DS_Store | Bin 0 -> 6148 bytes lib/js/emojione.js | 43 +- lib/js/emojione.min.js | 8 +- lib/php/src/Client.php | 98 +- lib/php/src/Ruleset.php | 4194 +++++++++++------ lib/php/test/ConversionTest.php | 58 +- lib/php/test/EmojiTest.php | 6 +- lib/php/test/EmojioneTest.php | 6 +- lib/php/test/SpriteTest.php | 6 +- 31 files changed, 7305 insertions(+), 5145 deletions(-) create mode 100644 lib/js/.DS_Store diff --git a/LICENSE.md b/LICENSE.md index 5148025c7..6fe20805f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,9 +1,9 @@ #### Emoji One Artwork * Applies to all PNG and SVG files as well as any adaptations made. -* License: Creative Commons Attribution-ShareAlike 4.0 International -* Human Readable License: http://creativecommons.org/licenses/by-sa/4.0/ -* Complete Legal Terms: http://creativecommons.org/licenses/by-sa/4.0/legalcode +* License: Creative Commons Attribution 4.0 International +* Human Readable License: http://creativecommons.org/licenses/by/4.0/ +* Complete Legal Terms: http://creativecommons.org/licenses/by/4.0/legalcode #### Emoji One Non-Artwork diff --git a/demos/alternate-alt-tags.html b/demos/alternate-alt-tags.html index 5cce1609e..5a1f16eb7 100644 --- a/demos/alternate-alt-tags.html +++ b/demos/alternate-alt-tags.html @@ -50,7 +50,7 @@
-

Emoji One Labs

version 1.5.2 +

Emoji One Labs

version 2.0.0
@@ -180,7 +180,7 @@

Code: