Переглянути джерело

Switch from Emojione to Twemoji

Danilo Bargen 6 роки тому
батько
коміт
4f2d816eff
100 змінених файлів з 26 додано та 51 видалено
  1. 0 1
      .licenses/emojione-artwork
  2. 0 19
      .licenses/emojione-js
  3. 5 0
      .licenses/twemoji
  4. 4 27
      LICENSE-3RD-PARTY.txt
  5. 1 2
      gather-licenses.sh
  6. 10 2
      index.html
  7. 5 0
      package-lock.json
  8. 1 0
      package.json
  9. BIN
      public/emoji/1f004.png
  10. BIN
      public/emoji/1f0cf.png
  11. BIN
      public/emoji/1f170.png
  12. BIN
      public/emoji/1f171.png
  13. BIN
      public/emoji/1f17e.png
  14. BIN
      public/emoji/1f17f.png
  15. BIN
      public/emoji/1f18e.png
  16. BIN
      public/emoji/1f191.png
  17. BIN
      public/emoji/1f192.png
  18. BIN
      public/emoji/1f193.png
  19. BIN
      public/emoji/1f194.png
  20. BIN
      public/emoji/1f195.png
  21. BIN
      public/emoji/1f196.png
  22. BIN
      public/emoji/1f197.png
  23. BIN
      public/emoji/1f198.png
  24. BIN
      public/emoji/1f199.png
  25. BIN
      public/emoji/1f19a.png
  26. BIN
      public/emoji/1f1e6-1f1e8.png
  27. BIN
      public/emoji/1f1e6-1f1e9.png
  28. BIN
      public/emoji/1f1e6-1f1ea.png
  29. BIN
      public/emoji/1f1e6-1f1eb.png
  30. BIN
      public/emoji/1f1e6-1f1ec.png
  31. BIN
      public/emoji/1f1e6-1f1ee.png
  32. BIN
      public/emoji/1f1e6-1f1f1.png
  33. BIN
      public/emoji/1f1e6-1f1f2.png
  34. BIN
      public/emoji/1f1e6-1f1f4.png
  35. BIN
      public/emoji/1f1e6-1f1f6.png
  36. BIN
      public/emoji/1f1e6-1f1f7.png
  37. BIN
      public/emoji/1f1e6-1f1f8.png
  38. BIN
      public/emoji/1f1e6-1f1f9.png
  39. BIN
      public/emoji/1f1e6-1f1fa.png
  40. BIN
      public/emoji/1f1e6-1f1fc.png
  41. BIN
      public/emoji/1f1e6-1f1fd.png
  42. BIN
      public/emoji/1f1e6-1f1ff.png
  43. BIN
      public/emoji/1f1e6.png
  44. BIN
      public/emoji/1f1e7-1f1e6.png
  45. BIN
      public/emoji/1f1e7-1f1e7.png
  46. BIN
      public/emoji/1f1e7-1f1e9.png
  47. BIN
      public/emoji/1f1e7-1f1ea.png
  48. BIN
      public/emoji/1f1e7-1f1eb.png
  49. BIN
      public/emoji/1f1e7-1f1ec.png
  50. BIN
      public/emoji/1f1e7-1f1ed.png
  51. BIN
      public/emoji/1f1e7-1f1ee.png
  52. BIN
      public/emoji/1f1e7-1f1ef.png
  53. BIN
      public/emoji/1f1e7-1f1f1.png
  54. BIN
      public/emoji/1f1e7-1f1f2.png
  55. BIN
      public/emoji/1f1e7-1f1f3.png
  56. BIN
      public/emoji/1f1e7-1f1f4.png
  57. BIN
      public/emoji/1f1e7-1f1f6.png
  58. BIN
      public/emoji/1f1e7-1f1f7.png
  59. BIN
      public/emoji/1f1e7-1f1f8.png
  60. BIN
      public/emoji/1f1e7-1f1f9.png
  61. BIN
      public/emoji/1f1e7-1f1fb.png
  62. BIN
      public/emoji/1f1e7-1f1fc.png
  63. BIN
      public/emoji/1f1e7-1f1fe.png
  64. BIN
      public/emoji/1f1e7-1f1ff.png
  65. BIN
      public/emoji/1f1e7.png
  66. BIN
      public/emoji/1f1e8-1f1e6.png
  67. BIN
      public/emoji/1f1e8-1f1e8.png
  68. BIN
      public/emoji/1f1e8-1f1e9.png
  69. BIN
      public/emoji/1f1e8-1f1eb.png
  70. BIN
      public/emoji/1f1e8-1f1ec.png
  71. BIN
      public/emoji/1f1e8-1f1ed.png
  72. BIN
      public/emoji/1f1e8-1f1ee.png
  73. BIN
      public/emoji/1f1e8-1f1f0.png
  74. BIN
      public/emoji/1f1e8-1f1f1.png
  75. BIN
      public/emoji/1f1e8-1f1f2.png
  76. BIN
      public/emoji/1f1e8-1f1f3.png
  77. BIN
      public/emoji/1f1e8-1f1f4.png
  78. BIN
      public/emoji/1f1e8-1f1f5.png
  79. BIN
      public/emoji/1f1e8-1f1f7.png
  80. BIN
      public/emoji/1f1e8-1f1fa.png
  81. BIN
      public/emoji/1f1e8-1f1fb.png
  82. BIN
      public/emoji/1f1e8-1f1fc.png
  83. BIN
      public/emoji/1f1e8-1f1fd.png
  84. BIN
      public/emoji/1f1e8-1f1fe.png
  85. BIN
      public/emoji/1f1e8-1f1ff.png
  86. BIN
      public/emoji/1f1e8.png
  87. BIN
      public/emoji/1f1e9-1f1ea.png
  88. BIN
      public/emoji/1f1e9-1f1ec.png
  89. BIN
      public/emoji/1f1e9-1f1ef.png
  90. BIN
      public/emoji/1f1e9-1f1f0.png
  91. BIN
      public/emoji/1f1e9-1f1f2.png
  92. BIN
      public/emoji/1f1e9-1f1f4.png
  93. BIN
      public/emoji/1f1e9-1f1ff.png
  94. BIN
      public/emoji/1f1e9.png
  95. BIN
      public/emoji/1f1ea-1f1e6.png
  96. BIN
      public/emoji/1f1ea-1f1e8.png
  97. BIN
      public/emoji/1f1ea-1f1ea.png
  98. BIN
      public/emoji/1f1ea-1f1ec.png
  99. BIN
      public/emoji/1f1ea-1f1ed.png
  100. BIN
      public/emoji/1f1ea-1f1f7.png

+ 0 - 1
.licenses/emojione-artwork

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

+ 0 - 19
.licenses/emojione-js

@@ -1,19 +0,0 @@
-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.

+ 5 - 0
.licenses/twemoji

@@ -0,0 +1,5 @@
+Copyright 2018 Twitter, Inc and other contributors
+
+Code licensed under the MIT License: http://opensource.org/licenses/MIT
+
+Graphics licensed under CC-BY 4.0: https://creativecommons.org/licenses/by/4.0/

+ 4 - 27
LICENSE-3RD-PARTY.txt

@@ -627,37 +627,14 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 
 
 ----------
-License for EmojiOne Artwork
+License for Twemoji
 ----------
 
-EmojiOne free license: https://www.emojione.com/developers/free-license
+Copyright 2018 Twitter, Inc and other contributors
 
+Code licensed under the MIT License: http://opensource.org/licenses/MIT
 
-
-
-----------
-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.
+Graphics licensed under CC-BY 4.0: https://creativecommons.org/licenses/by/4.0/
 
 
 

+ 1 - 2
gather-licenses.sh

@@ -23,8 +23,7 @@ LICENSE_FILES=(
     'browserify' 'node_modules/browserify/LICENSE'
     'browserify-header' '.licenses/browserify-header'
     'croppie' 'node_modules/croppie/LICENSE'
-    'EmojiOne Artwork' '.licenses/emojione-artwork'
-    'EmojiOne JS' '.licenses/emojione-js'
+    'Twemoji' '.licenses/twemoji'
     'file-saver' 'node_modules/file-saver/LICENSE.md'
     'messageformat' 'node_modules/messageformat/LICENSE'
     'msgpack-lite' 'node_modules/msgpack-lite/LICENSE'

+ 10 - 2
index.html

@@ -46,7 +46,6 @@
 
     <!-- Third party stylesheets -->
     <link rel="stylesheet" href="node_modules/angular-material/angular-material.min.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 -->
@@ -93,6 +92,16 @@
         </footer>
     </div>
 
+    <!-- Emoji -->
+    <link rel="stylesheet" href="emoji/activity.css?v=[[VERSION]]" type="text/css" media="all" />
+    <link rel="stylesheet" href="emoji/flags.css?v=[[VERSION]]" type="text/css" media="all" />
+    <link rel="stylesheet" href="emoji/food.css?v=[[VERSION]]" type="text/css" media="all" />
+    <link rel="stylesheet" href="emoji/nature.css?v=[[VERSION]]" type="text/css" media="all" />
+    <link rel="stylesheet" href="emoji/objects.css?v=[[VERSION]]" type="text/css" media="all" />
+    <link rel="stylesheet" href="emoji/people.css?v=[[VERSION]]" type="text/css" media="all" />
+    <link rel="stylesheet" href="emoji/symbols.css?v=[[VERSION]]" type="text/css" media="all" />
+    <link rel="stylesheet" href="emoji/travel.css?v=[[VERSION]]" type="text/css" media="all" />
+
     <!-- Angular core -->
     <script src="node_modules/angular/angular.js?v=[[VERSION]]"></script>
     <script src="node_modules/angular-aria/angular-aria.min.js?v=[[VERSION]]"></script>
@@ -109,7 +118,6 @@
     <script src="node_modules/angular-qrcode/angular-qrcode.js?v=[[VERSION]]"></script>
     <script src="node_modules/angular-material/angular-material.min.js?v=[[VERSION]]"></script>
     <script src="node_modules/@uirouter/angularjs/release/angular-ui-router.min.js?v=[[VERSION]]"></script>
-    <script src="libs/emojione/emojione.min.js?v=[[VERSION]]"></script>
     <script src="node_modules/angularjs-scroll-glue/src/scrollglue.js?v=[[VERSION]]"></script>
     <script src="libs/angular-inview/angular-inview.js?v=[[VERSION]]"></script>
     <script src="libs/future.js?v=[[VERSION]]"></script>

+ 5 - 0
package-lock.json

@@ -8361,6 +8361,11 @@
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.0.tgz",
       "integrity": "sha1-cT2LgY2kIGh0C/aDhtBHnmb8ins="
     },
+    "twemoji": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/twemoji/-/twemoji-11.2.0.tgz",
+      "integrity": "sha512-DgTadXkRHugun6mjUf1k3ni04WC4jHOX1bN5MjuCM3nwRyIMdXIr8FmWzW5mEIZjht5jD3NaEyXC4j3POdQwyQ=="
+    },
     "type-detect": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",

+ 1 - 0
package.json

@@ -69,6 +69,7 @@
     "ts-events": "^3.1.5",
     "tsify": "^4.0.1",
     "tweetnacl": "^1.0.0",
+    "twemoji": "^11.2.0",
     "typescript": "^3.2.2",
     "webrtc-adapter": "^7.1.1"
   },

BIN
public/emoji/1f004.png


BIN
public/emoji/1f0cf.png


BIN
public/emoji/1f170.png


BIN
public/emoji/1f171.png


BIN
public/emoji/1f17e.png


BIN
public/emoji/1f17f.png


BIN
public/emoji/1f18e.png


BIN
public/emoji/1f191.png


BIN
public/emoji/1f192.png


BIN
public/emoji/1f193.png


BIN
public/emoji/1f194.png


BIN
public/emoji/1f195.png


BIN
public/emoji/1f196.png


BIN
public/emoji/1f197.png


BIN
public/emoji/1f198.png


BIN
public/emoji/1f199.png


BIN
public/emoji/1f19a.png


BIN
public/emoji/1f1e6-1f1e8.png


BIN
public/emoji/1f1e6-1f1e9.png


BIN
public/emoji/1f1e6-1f1ea.png


BIN
public/emoji/1f1e6-1f1eb.png


BIN
public/emoji/1f1e6-1f1ec.png


BIN
public/emoji/1f1e6-1f1ee.png


BIN
public/emoji/1f1e6-1f1f1.png


BIN
public/emoji/1f1e6-1f1f2.png


BIN
public/emoji/1f1e6-1f1f4.png


BIN
public/emoji/1f1e6-1f1f6.png


BIN
public/emoji/1f1e6-1f1f7.png


BIN
public/emoji/1f1e6-1f1f8.png


BIN
public/emoji/1f1e6-1f1f9.png


BIN
public/emoji/1f1e6-1f1fa.png


BIN
public/emoji/1f1e6-1f1fc.png


BIN
public/emoji/1f1e6-1f1fd.png


BIN
public/emoji/1f1e6-1f1ff.png


BIN
public/emoji/1f1e6.png


BIN
public/emoji/1f1e7-1f1e6.png


BIN
public/emoji/1f1e7-1f1e7.png


BIN
public/emoji/1f1e7-1f1e9.png


BIN
public/emoji/1f1e7-1f1ea.png


BIN
public/emoji/1f1e7-1f1eb.png


BIN
public/emoji/1f1e7-1f1ec.png


BIN
public/emoji/1f1e7-1f1ed.png


BIN
public/emoji/1f1e7-1f1ee.png


BIN
public/emoji/1f1e7-1f1ef.png


BIN
public/emoji/1f1e7-1f1f1.png


BIN
public/emoji/1f1e7-1f1f2.png


BIN
public/emoji/1f1e7-1f1f3.png


BIN
public/emoji/1f1e7-1f1f4.png


BIN
public/emoji/1f1e7-1f1f6.png


BIN
public/emoji/1f1e7-1f1f7.png


BIN
public/emoji/1f1e7-1f1f8.png


BIN
public/emoji/1f1e7-1f1f9.png


BIN
public/emoji/1f1e7-1f1fb.png


BIN
public/emoji/1f1e7-1f1fc.png


BIN
public/emoji/1f1e7-1f1fe.png


BIN
public/emoji/1f1e7-1f1ff.png


BIN
public/emoji/1f1e7.png


BIN
public/emoji/1f1e8-1f1e6.png


BIN
public/emoji/1f1e8-1f1e8.png


BIN
public/emoji/1f1e8-1f1e9.png


BIN
public/emoji/1f1e8-1f1eb.png


BIN
public/emoji/1f1e8-1f1ec.png


BIN
public/emoji/1f1e8-1f1ed.png


BIN
public/emoji/1f1e8-1f1ee.png


BIN
public/emoji/1f1e8-1f1f0.png


BIN
public/emoji/1f1e8-1f1f1.png


BIN
public/emoji/1f1e8-1f1f2.png


BIN
public/emoji/1f1e8-1f1f3.png


BIN
public/emoji/1f1e8-1f1f4.png


BIN
public/emoji/1f1e8-1f1f5.png


BIN
public/emoji/1f1e8-1f1f7.png


BIN
public/emoji/1f1e8-1f1fa.png


BIN
public/emoji/1f1e8-1f1fb.png


BIN
public/emoji/1f1e8-1f1fc.png


BIN
public/emoji/1f1e8-1f1fd.png


BIN
public/emoji/1f1e8-1f1fe.png


BIN
public/emoji/1f1e8-1f1ff.png


BIN
public/emoji/1f1e8.png


BIN
public/emoji/1f1e9-1f1ea.png


BIN
public/emoji/1f1e9-1f1ec.png


BIN
public/emoji/1f1e9-1f1ef.png


BIN
public/emoji/1f1e9-1f1f0.png


BIN
public/emoji/1f1e9-1f1f2.png


BIN
public/emoji/1f1e9-1f1f4.png


BIN
public/emoji/1f1e9-1f1ff.png


BIN
public/emoji/1f1e9.png


BIN
public/emoji/1f1ea-1f1e6.png


BIN
public/emoji/1f1ea-1f1e8.png


BIN
public/emoji/1f1ea-1f1ea.png


BIN
public/emoji/1f1ea-1f1ec.png


BIN
public/emoji/1f1ea-1f1ed.png


BIN
public/emoji/1f1ea-1f1f7.png


Деякі файли не було показано, через те що забагато файлів було змінено