Danilo Bargen преди 6 години
родител
ревизия
bb5e4e622e
променени са 3 файла, в които са добавени 45 реда и са изтрити 13 реда
  1. 13 0
      CHANGELOG.md
  2. 31 12
      package-lock.json
  3. 1 1
      package.json

+ 13 - 0
CHANGELOG.md

@@ -4,6 +4,15 @@ This changelog lists the most important changes for each released version. For
 the full log, please refer to the git commit history.
 
 
+### [v2.1.5][v2.1.5] (2019-01-24)
+
+Changes:
+
+* [change] Switch from Emojione to Twitter Emoji (Unicode 11.0) ([#721][i721])
+* [bug] Fix pasting of emoji ([#722][i722])
+* [bug] Fix UI bug when loading conversations ([#723][i723])
+
+
 ### [v2.1.4][v2.1.4] (2019-01-17)
 
 Changes:
@@ -661,7 +670,11 @@ First public release.
 [i709]: https://github.com/threema-ch/threema-web/issues/709
 [i712]: https://github.com/threema-ch/threema-web/issues/712
 [i713]: https://github.com/threema-ch/threema-web/issues/713
+[i721]: https://github.com/threema-ch/threema-web/issues/721
+[i722]: https://github.com/threema-ch/threema-web/issues/722
+[i723]: https://github.com/threema-ch/threema-web/issues/723
 
+[v2.1.5]: https://github.com/threema-ch/threema-web/compare/v2.1.4...v2.1.5
 [v2.1.4]: https://github.com/threema-ch/threema-web/compare/v2.1.3...v2.1.4
 [v2.1.3]: https://github.com/threema-ch/threema-web/compare/v2.1.2...v2.1.3
 [v2.1.2]: https://github.com/threema-ch/threema-web/compare/v2.1.1...v2.1.2

+ 31 - 12
package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "threema-web",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3335,7 +3335,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3356,12 +3357,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3376,17 +3379,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3503,7 +3509,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3515,6 +3522,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3529,6 +3537,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3536,12 +3545,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -3560,6 +3571,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3640,7 +3652,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3652,6 +3665,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3737,7 +3751,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3773,6 +3788,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3792,6 +3808,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3835,12 +3852,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "threema-web",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Threema Webclient",
   "scripts": {
     "build": "npm run build:js && npm run build:css",