Skip to content
This repository has been archived by the owner on Jul 23, 2019. It is now read-only.

Commit

Permalink
3.1 update
Browse files Browse the repository at this point in the history
  • Loading branch information
caseyahenson committed Jun 30, 2017
1 parent 865516e commit 4a166f9
Show file tree
Hide file tree
Showing 31 changed files with 22,156 additions and 15,420 deletions.
10 changes: 5 additions & 5 deletions .versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
babel-compiler@6.18.1
babel-compiler@6.18.2
babel-runtime@1.0.1
base64@1.0.10
blaze@2.1.8
Expand All @@ -8,16 +8,16 @@ caching-html-compiler@1.0.6
check@1.2.5
deps@1.0.12
diff-sequence@1.0.7
ecmascript@0.7.2
ecmascript@0.7.3
ecmascript-runtime@0.3.15
ejson@1.0.13
emojione:emojione@3.0.2
emojione:emojione@3.0.3
html-tools@1.0.11
htmljs@1.0.11
id-map@1.0.9
jquery@1.11.10
meteor@1.6.1
modules@0.8.1
modules@0.8.2
modules-runtime@0.7.10
mongo-id@1.0.6
observe-sequence@1.0.16
Expand All @@ -28,5 +28,5 @@ spacebars@1.0.12
spacebars-compiler@1.1.0
templating@1.1.12_1
templating-tools@1.1.1
tracker@1.1.2
tracker@1.1.3
underscore@1.0.10
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emojione",
"version": "3.0.3",
"version": "3.1.0",
"main": [
"extras/css/emojione.css",
"lib/js/emojione.js"
Expand Down
2 changes: 1 addition & 1 deletion emoji.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion emoji_strategy.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions examples/OTHER.md

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions extras/alpha-codes/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion extras/alpha-codes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand All @@ -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
Expand Down
Loading

0 comments on commit 4a166f9

Please sign in to comment.