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

Commit 168b9e0

Browse files
committed
3.1.5 release
1 parent 97b3ad8 commit 168b9e0

12 files changed

+995
-837
lines changed

.versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ecmascript-runtime@0.5.0
1414
ecmascript-runtime-client@0.6.0
1515
ecmascript-runtime-server@0.5.0
1616
ejson@1.1.0
17-
emojione:emojione@3.1.4
17+
emojione:emojione@3.1.5
1818
html-tools@1.0.11
1919
htmljs@1.0.11
2020
http@1.4.1

INSTALLATION.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
We've teamed up with [JSDelivr](http://www.jsdelivr.com/#!emojione) to provide a simple way to install these emoji on any javascript-enabled website. Add the following script and stylesheet links to the head of your webpage:
44

55
```
6-
<script src="https://cdn.jsdelivr.net/npm/emojione@3.1.4/lib/js/emojione.min.js"></script>
7-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/emojione@3.1.4/extras/css/emojione.min.css"/>
6+
<script src="https://cdn.jsdelivr.net/npm/emojione@3.1.5/lib/js/emojione.min.js"></script>
7+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/emojione@3.1.5/extras/css/emojione.min.css"/>
88
```
99

1010
Quick installs can also be done using NPM and Bower (for the Javascript toolkit) or Composer (for the PHP toolkit). **If you wish to serve image assets locally you'll need to install [emojione-assets](https://www.github.com/emojione/emojione-assets) and include the pngs and/or sprites into your project.** Many of our [demos](https://demos.emojione.com/latest/) use assets locally simply by pointing the `imagePathPNG` variable to your local asset location.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A set of libraries to help users find and replace native system emojis with Emoj
2121

2222
### EmojiOne Version 2
2323

24-
EmojiOne version 2 is no longer supported or distributed. Please see [UPGRADE.md](UPGRADE.md) for instructions on upgrading from version 2 to version 3.
24+
EmojiOne version 2 is no longer supported or distributed. Please see [UPGRADE.md](UPGRADE.md) for instructions on upgrading from version 2 to version 3. Version 2 was bound by the [Creative Commons Attribution 4.0 International License](http://creativecommons.org/licenses/by/4.0/).
2525

2626

2727
## Installation

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "emojione",
3-
"version": "3.1.4",
3+
"version": "3.1.5",
44
"main": [
55
"extras/css/emojione.css",
66
"lib/js/emojione.js"

emoji.json

+1-1
Large diffs are not rendered by default.

emoji_strategy.json

+1-1
Large diffs are not rendered by default.

extras/fonts/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ There's no better way to port our emoji into your device than through a native f
55
> Note: Due to their size, the font files have been removed from this repo and instead will be attached to releases on our repo that hosts the artwork and related assets, [emojione-assets](https://github.com/emojione/emojione-assets).
66
>
77
> Please go here to download the font files: [emojione-assets/releases](https://github.com/emojione/emojione-assets/releases)
8-
### Google Font - [emojione-android.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-android.ttf)
8+
### Google Font - [emojione-android.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.5/emojione-android.ttf)
99

1010
* Compatible with rooted Android devices and Linux.
1111
* Updated July 6, 2017
@@ -27,9 +27,9 @@ Linux Setup Help:
2727

2828
### Apple Font
2929

30-
**For older apple devices** - [emojione-apple.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-apple.ttf)
30+
**For older apple devices** - [emojione-apple.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.5/emojione-apple.ttf)
3131

32-
**For latest apple devices** - [emojione-apple.ttc](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-apple.ttc)
32+
**For latest apple devices** - [emojione-apple.ttc](https://github.com/emojione/emojione-assets/releases/download/3.1.5/emojione-apple.ttc)
3333

3434
* Compatible with Mac OSX, and iOS devices (iPhone, iPad).
3535
* Rename font to Apple Color Emoji.ttf for Mac OSX.
@@ -46,9 +46,9 @@ Search for “EmojiOne 2016” on Cydia and apply with BytaFont. Cydia is a soft
4646
### EmojiOne SVG-based Color Fonts
4747
Through a cooperative effort with Adobe Systems, EmojiOne created black and white versions of the emoji set which were used, in part, to generate this font. Using these fonts with Firefox or Microsoft Edge, you can enjoy full-color EmojiOne emoji. Black and white images will show as the fall back for systems that are not able to render color SVG fonts. The font is available in the following formats:
4848

49-
* Open Type Font: [emojione-svg.otf](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-svg.otf)
50-
* Web Open Font Format: [emojione-svg.woff](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-svg.woff)
51-
* Web Open Font Format 2.0: [emojione-svg.woff2](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-svg.woff2)
49+
* Open Type Font: [emojione-svg.otf](https://github.com/emojione/emojione-assets/releases/download/3.1.5/emojione-svg.otf)
50+
* Web Open Font Format: [emojione-svg.woff](https://github.com/emojione/emojione-assets/releases/download/3.1.5/emojione-svg.woff)
51+
* Web Open Font Format 2.0: [emojione-svg.woff2](https://github.com/emojione/emojione-assets/releases/download/3.1.5/emojione-svg.woff2)
5252

5353
---
5454

lib/js/emojione.js

+14-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/js/emojione.min.js

+21-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)