Upgrade to emojione v3

- Add new PNGs
- Add new spritemap + mapping css
- Update emojione.min.js
- Update emoji picker
- Update license file
- Add greedyMatch option to emojify filter

Greedy matching will allow us to parse emoji without an emoji variant selector.

.licenses/emojione-artwork

@@ -0,0 +1 @@
+EmojiOne free license: https://www.emojione.com/developers/free-license

.licenses/emojione-js

@@ -0,0 +1,19 @@
+Copyright 2017 Ranks.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE-3RD-PARTY.txt

@@ -566,6 +566,42 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 
 
 
+----------
+License for EmojiOne JS
+----------
+
+Copyright 2017 Ranks.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+
+----------
+License for EmojiOne Artwork
+----------
+
+EmojiOne free license: https://www.emojione.com/developers/free-license
+
+
+
+
 ----------
 License for file-saver
 ----------

README.md

@@ -124,6 +124,8 @@ keybase](https://keybase.io/threema).
 
 ## License
 
+Threema Web license:
+
     Threema Web.
 
     Copyright © 2016-2017 Threema GmbH (https://threema.ch/).
@@ -140,3 +142,5 @@ keybase](https://keybase.io/threema).
 
     You should have received a copy of the GNU Affero General Public License
     along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+For third party library licenses, see `LICENSE-3RD-PARTY.txt`.

dist/package.sh

@@ -83,7 +83,7 @@ for target in "${targets[@]}"; do
 done
 
 echo "+ Update version number..."
-sed -i "s/\[\[VERSION\]\]/${VERSION}/g" $DIR/index.html $DIR/troubleshoot/index.html $DIR/dist/app.js $DIR/version.txt
+sed -i "s/\[\[VERSION\]\]/${VERSION}/g" $DIR/index.html $DIR/troubleshoot/index.html $DIR/dist/app.js $DIR/version.txt $DIR/libs/emojione/emojione.sprites.32.css
 
 echo "+ Update permissions..."
 find $DIR/ -type f -exec chmod 644 {} \;

gather-licenses.sh

@@ -22,6 +22,8 @@ LICENSE_FILES=(
     'browserify' 'node_modules/browserify/LICENSE'
     'browserify-header' '.licenses/browserify-header'
     'croppie' 'node_modules/croppie/LICENSE'
+    'EmojiOne JS' '.licenses/emojione-js'
+    'EmojiOne Artwork' '.licenses/emojione-artwork'
     'file-saver' 'node_modules/file-saver/LICENSE.md'
     'js-sha256' 'node_modules/js-sha256/LICENSE.txt'
     'messageformat' 'node_modules/messageformat/LICENSE'

index.html

@@ -38,7 +38,7 @@
 
     <!-- Third party stylesheets -->
     <link rel="stylesheet" href="node_modules/angular-material/angular-material.min.css?v=[[VERSION]]">
-    <link rel="stylesheet" href="libs/emojione/emojione.sprites.32.css?v=[[VERSION]]">
+    <link rel="stylesheet" href="libs/emojione/emojione-sprite-32.min.css?v=[[VERSION]]">
     <link rel="stylesheet" href="node_modules/croppie/croppie.css?v=[[VERSION]]">
 
     <!-- Fonts -->