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

Commit

Permalink
3.1.5 release
Browse files Browse the repository at this point in the history
  • Loading branch information
caseyahenson committed Jun 15, 2018
1 parent 97b3ad8 commit 168b9e0
Show file tree
Hide file tree
Showing 12 changed files with 995 additions and 837 deletions.
2 changes: 1 addition & 1 deletion .versions
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ [email protected]
[email protected]
[email protected]
[email protected]
emojione:[email protected].4
emojione:[email protected].5
[email protected]
[email protected]
[email protected]
Expand Down
4 changes: 2 additions & 2 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
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:

```
<script src="https://cdn.jsdelivr.net/npm/[email protected].4/lib/js/emojione.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].4/extras/css/emojione.min.css"/>
<script src="https://cdn.jsdelivr.net/npm/[email protected].5/lib/js/emojione.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].5/extras/css/emojione.min.css"/>
```

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.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ A set of libraries to help users find and replace native system emojis with Emoj

### EmojiOne Version 2

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.
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/).


## Installation
Expand Down
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.1.4",
"version": "3.1.5",
"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.

12 changes: 6 additions & 6 deletions extras/fonts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ There's no better way to port our emoji into your device than through a native f
> 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).
>
> Please go here to download the font files: [emojione-assets/releases](https://github.com/emojione/emojione-assets/releases)
### Google Font - [emojione-android.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-android.ttf)
### Google Font - [emojione-android.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.5/emojione-android.ttf)

This comment has been minimized.

Copy link
@maximbaz

maximbaz Jun 17, 2018

Contributor

@caseyahenson there have been no commits and no releases in emojione-assets since 3.1.2, so these links are broken. Could you please investigate?

This comment has been minimized.

Copy link
@caseyahenson

caseyahenson Jun 18, 2018

Author Contributor

@maximbaz Thanks for pointing that out! Just pushed an update with corrected versioning.


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

### Apple Font

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

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

* Compatible with Mac OSX, and iOS devices (iPhone, iPad).
* Rename font to Apple Color Emoji.ttf for Mac OSX.
Expand All @@ -46,9 +46,9 @@ Search for “EmojiOne 2016” on Cydia and apply with BytaFont. Cydia is a soft
### EmojiOne SVG-based Color Fonts
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:

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

---

Expand Down
31 changes: 14 additions & 17 deletions lib/js/emojione.js

Large diffs are not rendered by default.

40 changes: 21 additions & 19 deletions lib/js/emojione.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 168b9e0

Please sign in to comment.