Merge remote-tracking branch 'origin/develop' into dbkr/cross_signing

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "riot-web",
-  "version": "0.17.8",
+  "version": "0.17.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -114,9 +114,9 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.2.0",
+      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.1.tgz",
-      "integrity": "sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==",
+      "integrity": "sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==",
       "requires": {
         "regenerator-runtime": "^0.12.0"
       },
@@ -2239,9 +2239,9 @@
       }
     },
     "base-x": {
-      "version": "3.0.5",
+      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.4.tgz",
-      "integrity": "sha512-C3picSgzPSLE+jW3tcBzJoGwitOtazb5B+5YmAxZm2ybmTi9LNgAtDO/jjVEBZwHoXmDBZ9m/IELj3elJVRBcA==",
+      "integrity": "sha512-UYOadoSIkEI/VrRGSG6qp93rp2WdokiAiNYDfGW5qURAY8GiAQkvMbwNNSDYiVJopqv4gCna7xqf4rrNGp+5AA==",
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -7272,7 +7272,7 @@
     },
     "got": {
       "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
@@ -7480,11 +7480,11 @@
       }
     },
     "hoist-non-react-statics": {
-      "version": "3.2.1",
+      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-      "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==",
+      "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
       "requires": {
-        "react-is": "^16.3.2"
+        "react-is": "^16.7.0"
       }
     },
     "home-or-tmp": {
@@ -8286,8 +8286,7 @@
     "ip-regex": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
-      "dev": true
     },
     "ipaddr.js": {
       "version": "1.8.0",
@@ -8500,6 +8499,14 @@
         "is-path-inside": "^1.0.0"
       }
     },
+    "is-ip": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz",
+      "integrity": "sha1-aO6gfooKCpTC0IDdZ0xzGrKkYas=",
+      "requires": {
+        "ip-regex": "^2.0.0"
+      }
+    },
     "is-npm": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
@@ -9073,9 +9080,9 @@
       }
     },
     "linkifyjs": {
-      "version": "2.1.7",
+      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.7.tgz",
+      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.8.tgz",
-      "integrity": "sha512-Cbn77BnYEslpAObZZoP6GVQHF1j5T6RsDydNq5RVxIy4eiZAiADRx7qHfWzfEMQecc1PtZFog1AsCGGX2WjQLA==",
+      "integrity": "sha512-j3QpiEr4UYzN5foKhrr9Sr06VI9vSlI4HisDWt+7Mq+TWDwpJ6H/LLpogYsXcyUIJLVhGblXXdUnblHsVNMPpg==",
       "requires": {
         "jquery": "^3.3.1",
         "react": "^16.4.2",
@@ -9310,19 +9317,21 @@
       "dev": true
     },
     "matrix-js-sdk": {
-      "version": "0.14.2",
+      "version": "0.14.3",
-      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.14.2.tgz",
+      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.14.3.tgz",
-      "integrity": "sha512-6Wvzv3fKjlmNz/tqGlvBy2RouqyK8VfR2elXaJlFpPnSOiE6+CNeF8vJZC7Ch4e+/W3LDnpG6IIVZ55iMEULyg==",
+      "integrity": "sha512-yok8489WIEk/M0EgDwczviyPFAjAoC08k1XiDf6PtNUnGwLvkKS6xMAT3O7qHrXr7X+A1hLQX0YmUsLdjKzGmQ==",
       "requires": {
         "another-json": "^0.2.0",
         "babel-runtime": "^6.26.0",
+        "base-x": "3.0.4",
         "bluebird": "^3.5.0",
         "browser-request": "^0.3.3",
         "bs58": "^4.0.1",
         "content-type": "^1.0.2",
         "loglevel": "1.6.1",
         "qs": "^6.5.2",
-        "request": "^2.88.0"
+        "request": "^2.88.0",
+        "unhomoglyph": "^1.0.2"
       }
     },
     "matrix-mock-request": {
@@ -9336,9 +9345,9 @@
       }
     },
     "matrix-react-sdk": {
-      "version": "0.14.7",
+      "version": "0.14.8",
-      "resolved": "https://registry.npmjs.org/matrix-react-sdk/-/matrix-react-sdk-0.14.7.tgz",
+      "resolved": "https://registry.npmjs.org/matrix-react-sdk/-/matrix-react-sdk-0.14.8.tgz",
-      "integrity": "sha512-CbgX/OxdjvRKQ8TPzeJH0RD3kAMPk8lFxzmfgSzR9gWQ0bdXeBT6iadWQLe9dujjBviU1rMDl+Wy8NYgd8FmdQ==",
+      "integrity": "sha512-BMrcIAAF0cx2qf0PMWTZILewN3Ig2BkY6jv1vUGnVA9g1HrNc6j7CU7cr4jBXh2MX8pYtDlgUJm4F5uvNaR5eQ==",
       "requires": {
         "babel-plugin-syntax-dynamic-import": "^6.18.0",
         "babel-runtime": "^6.26.0",
@@ -9355,14 +9364,16 @@
         "flux": "2.1.1",
         "focus-trap-react": "^3.0.5",
         "fuse.js": "^2.2.0",
+        "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b",
         "gfm.css": "^1.1.1",
         "glob": "^5.0.14",
         "highlight.js": "^9.13.0",
+        "is-ip": "^2.0.0",
         "isomorphic-fetch": "^2.2.1",
         "linkifyjs": "^2.1.6",
         "lodash": "^4.13.1",
         "lolex": "2.3.2",
-        "matrix-js-sdk": "0.14.2",
+        "matrix-js-sdk": "0.14.3",
         "optimist": "^0.6.1",
         "pako": "^1.0.5",
         "prop-types": "^15.5.8",
@@ -9372,45 +9383,20 @@
         "react-addons-css-transition-group": "15.3.2",
         "react-beautiful-dnd": "^4.0.1",
         "react-dom": "^15.6.0",
+        "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
         "resize-observer-polyfill": "^1.5.0",
         "sanitize-html": "^1.18.4",
         "slate": "^0.41.2",
         "slate-html-serializer": "^0.6.1",
+        "slate-md-serializer": "github:matrix-org/slate-md-serializer#f7c4ad394f5af34d4c623de7909ce95ab78072d3",
         "slate-react": "^0.18.10",
         "text-encoding-utf-8": "^1.0.1",
         "url": "^0.11.0",
+        "velocity-vector": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
         "whatwg-fetch": "^1.1.1",
         "zxcvbn": "^4.4.2"
       },
       "dependencies": {
-        "gemini-scrollbar": {
-          "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b",
-          "from": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
-        },
-        "react-gemini-scrollbar": {
-          "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
-          "from": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
-          "requires": {
-            "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
-          },
-          "dependencies": {
-            "gemini-scrollbar": {
-              "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b",
-              "from": "github:matrix-org/gemini-scrollbar#b302279"
-            }
-          }
-        },
-        "slate-md-serializer": {
-          "version": "github:matrix-org/slate-md-serializer#f7c4ad394f5af34d4c623de7909ce95ab78072d3",
-          "from": "github:matrix-org/slate-md-serializer#f7c4ad394f5af34d4c623de7909ce95ab78072d3"
-        },
-        "velocity-vector": {
-          "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
-          "from": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
-          "requires": {
-            "jquery": ">= 1.4.3"
-          }
-        },
         "whatwg-fetch": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz",
@@ -10109,6 +10095,12 @@
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
       "dev": true
     },
+    "olm": {
+      "version": "3.1.0-pre2",
+      "resolved": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre2.tgz",
+      "integrity": "sha512-wDWYaAPpgB19aW/cEHxyoKhKzfg6Jn83SerokRPA/N/QvGq9M0T5BPEnZQiVBDX7V03aPEm9EsAzFiTNuyzMkQ==",
+      "optional": true
+    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -11442,6 +11434,13 @@
         "prop-types": "^15.5.10"
       }
     },
+    "react-gemini-scrollbar": {
+      "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
+      "from": "github:matrix-org/react-gemini-scrollbar#5e97aef",
+      "requires": {
+        "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
+      }
+    },
     "react-immutable-proptypes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz",
@@ -12632,9 +12631,9 @@
       }
     },
     "slate-base64-serializer": {
-      "version": "0.2.94",
+      "version": "0.2.95",
-      "resolved": "https://registry.npmjs.org/slate-base64-serializer/-/slate-base64-serializer-0.2.94.tgz",
+      "resolved": "https://registry.npmjs.org/slate-base64-serializer/-/slate-base64-serializer-0.2.95.tgz",
-      "integrity": "sha512-jltk0PwOS1lu/TRHTN/qW67+VSXlbX1d0GottPloKjYwHBbH47GVT/G+hmkOdrGXzV7P6220BvQwN8Xq2RaJ5A==",
+      "integrity": "sha512-WK8roQUQBM7lHXNS6HYNmMSJ5tJmuoLeZkHJEHWCEl+1op1m5sC2onzBfpIRNP8AijlZ3m+lGlxfLO+3VtBMxw==",
       "requires": {
         "isomorphic-base64": "^1.0.2"
       }
@@ -12675,10 +12674,14 @@
         "type-of": "^2.0.1"
       }
     },
+    "slate-md-serializer": {
+      "version": "github:matrix-org/slate-md-serializer#f7c4ad394f5af34d4c623de7909ce95ab78072d3",
+      "from": "github:matrix-org/slate-md-serializer#f7c4ad3"
+    },
     "slate-plain-serializer": {
-      "version": "0.6.33",
+      "version": "0.6.34",
-      "resolved": "https://registry.npmjs.org/slate-plain-serializer/-/slate-plain-serializer-0.6.33.tgz",
+      "resolved": "https://registry.npmjs.org/slate-plain-serializer/-/slate-plain-serializer-0.6.34.tgz",
-      "integrity": "sha512-dkbWQvB9FA/qN3HfkQ++xksaBHZsa6NCBG42OV70Y2wLSjN7Ym8NzQMR4bb5i67kL+ko+TXJ0Qg2sNiOEATCNQ=="
+      "integrity": "sha512-NuP00YRZxepDWB3c+SUW0aKsA+RFLw3Lrl3g6011SKNsBlPR9TZlvOy8VqyNCHhBdpyiT9IoIDuA69D+r5q7TA=="
     },
     "slate-prop-types": {
       "version": "0.4.67",
@@ -13190,9 +13193,9 @@
       }
     },
     "sshpk": {
-      "version": "1.16.0",
+      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -13884,6 +13887,11 @@
       "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz",
       "integrity": "sha1-jN2PusTi0uoefi6Al8QvRCKA+Fs="
     },
+    "unhomoglyph": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.2.tgz",
+      "integrity": "sha1-1p5fWmocayEZQaCIm4HrqGWVwlM="
+    },
     "union-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
@@ -14196,6 +14204,13 @@
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
     },
+    "velocity-vector": {
+      "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
+      "from": "github:vector-im/velocity#059e3b2",
+      "requires": {
+        "jquery": ">= 1.4.3"
+      }
+    },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
@@ -15226,7 +15241,7 @@
     },
     "xmlbuilder": {
       "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
       "dev": true
     },

package.json

@@ -147,7 +147,7 @@
     "webpack-dev-server": "^3.1.10"
   },
   "optionalDependencies": {
-    "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz"
+    "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre2.tgz"
   },
   "build": {
     "appId": "im.riot.app",