3.1 update

joypixels · Jun 30, 2017 · 4a166f9 · 4a166f9
1 parent 865516e
commit 4a166f9
Show file tree

Hide file tree

Showing 31 changed files with 22,156 additions and 15,420 deletions.
diff --git a/.versions b/.versions
@@ -1,4 +1,4 @@
-[email protected].1
+[email protected].2
 [email protected]
 [email protected]
 [email protected]
@@ -8,16 +8,16 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
-emojione:[email protected].2
+emojione:[email protected].3
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 [email protected]
 [email protected]
@@ -28,5 +28,5 @@ [email protected]
 [email protected]
 [email protected]_1
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "main": [
     "extras/css/emojione.css",
     "lib/js/emojione.js"

diff --git a/emoji.json b/emoji.json
diff --git a/emoji_strategy.json b/emoji_strategy.json
diff --git a/examples/OTHER.md b/examples/OTHER.md
diff --git a/extras/alpha-codes/CHANGELOG.md b/extras/alpha-codes/CHANGELOG.md
@@ -1,6 +1,14 @@
 changelog
 ---------
 
+####UPDATE 2017-06-30
+* additions
+  * Unicode 10 charcters
+
+* changes
+  * inclusion of output code point attribute, used to generate native Unicode
+
+
 ####UPDATE 2017-04-15
 * additions
   * gender based roles

diff --git a/extras/alpha-codes/README.md b/extras/alpha-codes/README.md
@@ -19,16 +19,19 @@ We've included the current list of emoji alpha codes in two formats, json and cs
 ```
 {
     "1f600": {
+        "output": "1f601",
         "name": "grinning face",
         "alpha_code": ":grinning:",
         "aliases": ""
     },
     "1f642": {
+        "output": "1f642",
         "name": "slightly smiling face",
         "alpha_code": ":slight_smile:",
         "aliases": ":slightly_smiling_face:"
     },
     "1f36e": {
+        "output": "1f46e",
         "name": "custard",
         "alpha_code": ":custard:",
         "aliases": ":pudding:|:flan:"
@@ -39,7 +42,7 @@ We've included the current list of emoji alpha codes in two formats, json and cs
 ##### CSV
 
 ```
-“unicode”, “name”, "alpha_code”, “aliases”
+“unicode”, "output", “name”, "alpha_code”, “aliases”
 ```
 
 ### LICENSE