diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11b496a3..1551e7f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,68 @@
+Changes in [0.17.6](https://github.com/vector-im/riot-web/releases/tag/v0.17.6) (2018-11-19)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.6-rc.2...v0.17.6)
+
+ * No changes since rc.2
+
+Changes in [0.17.6-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.17.6-rc.2) (2018-11-15)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.6-rc.1...v0.17.6-rc.2)
+
+ * Update to js-sdk 0.14 and react-sdk rc.2. rc.1 was broken as it was built against
+ js-sdk 0.13 which does not use the new Olm 3.0 API.
+
+Changes in [0.17.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.6-rc.1) (2018-11-15)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.5...v0.17.6-rc.1)
+
+ * Update from Weblate.
+ [\#7708](https://github.com/vector-im/riot-web/pull/7708)
+ * Add Japanese (#7599)
+ [\#7673](https://github.com/vector-im/riot-web/pull/7673)
+ * Allow Webpack dev server to listen to all interfaces
+ [\#7674](https://github.com/vector-im/riot-web/pull/7674)
+ * Remove the request-only stuff we don't need anymore
+ [\#7637](https://github.com/vector-im/riot-web/pull/7637)
+ * Correct the author of the electron app
+ [\#7615](https://github.com/vector-im/riot-web/pull/7615)
+ * Mock fs, tls, and net to support request in the browser
+ [\#7552](https://github.com/vector-im/riot-web/pull/7552)
+ * Update chokidar to transitively get newer fsevents
+ [\#7598](https://github.com/vector-im/riot-web/pull/7598)
+ * Support WebAssembly version of Olm
+ [\#7385](https://github.com/vector-im/riot-web/pull/7385)
+
+Changes in [0.17.5](https://github.com/vector-im/riot-web/releases/tag/v0.17.5) (2018-11-13)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.4...v0.17.5)
+
+ * Include change that was supposed to be included in orevious version
+
+Changes in [0.17.4](https://github.com/vector-im/riot-web/releases/tag/v0.17.4) (2018-11-13)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.3...v0.17.4)
+
+ * Add banner with login/register links for users who aren't logged in
+
+Changes in [0.17.3](https://github.com/vector-im/riot-web/releases/tag/v0.17.3) (2018-10-29)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.3-rc.1...v0.17.3)
+
+ * Fix for autocompleting text emoji from react-sdk v0.14.2
+
+Changes in [0.17.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.3-rc.1) (2018-10-24)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.2...v0.17.3-rc.1)
+
+ * Update from Weblate.
+ [\#7549](https://github.com/vector-im/riot-web/pull/7549)
+ * Don't set tags on notifications
+ [\#7518](https://github.com/vector-im/riot-web/pull/7518)
+ * Update to latest electron builder
+ [\#7498](https://github.com/vector-im/riot-web/pull/7498)
+ * Fix Tinter.setTheme to not fire using Firefox
+ [\#6831](https://github.com/vector-im/riot-web/pull/6831)
+
Changes in [0.17.2](https://github.com/vector-im/riot-web/releases/tag/v0.17.2) (2018-10-19)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.1...v0.17.2)
diff --git a/electron_app/package.json b/electron_app/package.json
index 0600216b..4fbefd00 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,9 +2,9 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "0.17.2",
+ "version": "0.17.6",
"description": "A feature-rich client for Matrix.org",
- "author": "Vector Creations Ltd.",
+ "author": "New Vector Ltd.",
"dependencies": {
"auto-launch": "^5.0.1",
"electron-window-state": "^4.1.0",
diff --git a/package-lock.json b/package-lock.json
index 6d34336a..ab504339 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "riot-web",
- "version": "0.17.2",
+ "version": "0.17.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -591,31 +591,31 @@
}
},
"app-builder-bin": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.1.2.tgz",
- "integrity": "sha512-PZJspzAqB0+z60OalXChP9I05BzODd/ffDz6RvTmDG3qclr7YrnpqzvPF+T7vGVtk2nN7syuveTQROJfXcB8xA==",
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.1.4.tgz",
+ "integrity": "sha512-i5ZfZtnAQqVZXpFYpvkQK/V0p9RwJjCW7X3CRcyDrnR3p1mQRoRTMSfPrtGTo1ens7kTfzk2S2i0QXq+gEplLg==",
"dev": true
},
"app-builder-lib": {
- "version": "20.28.4",
- "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.28.4.tgz",
- "integrity": "sha512-RY4/NJs1HCFWAOpLMivuDzbesU5VyaZVKuQllxgCNZ56+ihgO5aGexla2DVjG/bBQleWfF3DPnEsF3sbZPlpHw==",
+ "version": "20.29.0",
+ "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.29.0.tgz",
+ "integrity": "sha512-pXIHWNdeQ+jqI5xv4L274YZo2AOSotXsH9/Q83+qgiAa62F/PIWgcd0LWWa//CD929+FrRFEgBq9sagh9uUTHw==",
"dev": true,
"requires": {
"7zip-bin": "~4.0.2",
- "app-builder-bin": "2.1.2",
+ "app-builder-bin": "2.1.4",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.5",
- "builder-util": "6.1.3",
- "builder-util-runtime": "4.4.1",
+ "builder-util": "7.0.0",
+ "builder-util-runtime": "5.0.0",
"chromium-pickle-js": "^0.2.0",
- "debug": "^3.1.0",
+ "debug": "^4.1.0",
"ejs": "^2.6.1",
- "electron-osx-sign": "0.4.10",
- "electron-publish": "20.28.3",
+ "electron-osx-sign": "0.4.11",
+ "electron-publish": "20.29.0",
"fs-extra-p": "^4.6.1",
"hosted-git-info": "^2.7.1",
- "is-ci": "^1.2.0",
+ "is-ci": "^1.2.1",
"isbinaryfile": "^3.0.3",
"js-yaml": "^3.12.0",
"lazy-val": "^1.0.3",
@@ -624,8 +624,19 @@
"plist": "^3.0.1",
"read-config-file": "3.1.2",
"sanitize-filename": "^1.6.1",
- "semver": "^5.5.1",
+ "semver": "^5.6.0",
"temp-file": "^3.1.3"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+ "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ }
}
},
"aproba": {
@@ -2599,27 +2610,36 @@
"dev": true
},
"builder-util": {
- "version": "6.1.3",
- "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-6.1.3.tgz",
- "integrity": "sha512-MXeARNff9KHlzJYGJcAhLI/tpE57PmUnleaYfL22IE+viRt192Yr3wQL444ztsA+LUHJ8d12moUoG00jh1hfLA==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-7.0.0.tgz",
+ "integrity": "sha512-GnszunK4uX1F8XP4U01m47VME0UQo97wM1i8h77j6+7V0xMz8faL9BHdv2O8/iOZ8HjfKSRJ+1v7RHohF6H0lA==",
"dev": true,
"requires": {
"7zip-bin": "~4.0.2",
- "app-builder-bin": "2.1.2",
+ "app-builder-bin": "2.1.4",
"bluebird-lst": "^1.0.5",
- "builder-util-runtime": "^4.4.1",
+ "builder-util-runtime": "^5.0.0",
"chalk": "^2.4.1",
- "debug": "^3.1.0",
+ "debug": "^4.1.0",
"fs-extra-p": "^4.6.1",
- "is-ci": "^1.2.0",
+ "is-ci": "^1.2.1",
"js-yaml": "^3.12.0",
"lazy-val": "^1.0.3",
- "semver": "^5.5.1",
+ "semver": "^5.6.0",
"source-map-support": "^0.5.9",
"stat-mode": "^0.2.2",
"temp-file": "^3.1.3"
},
"dependencies": {
+ "debug": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+ "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
"source-map-support": {
"version": "0.5.9",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
@@ -2633,15 +2653,26 @@
}
},
"builder-util-runtime": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.4.1.tgz",
- "integrity": "sha512-8L2pbL6D3VdI1f8OMknlZJpw0c7KK15BRz3cY77AOUElc4XlCv2UhVV01jJM7+6Lx7henaQh80ALULp64eFYAQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-5.0.0.tgz",
+ "integrity": "sha512-mTyLqmzdPzavKQNAfxcGu6kqaDiPCtFKJG+nNO9SYfL6lY7VgTUW+45iXhowc5ElmPj0eSTDaIGlScxVMwFUEA==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.5",
- "debug": "^3.1.0",
+ "debug": "^4.1.0",
"fs-extra-p": "^4.6.1",
"sax": "^1.2.4"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+ "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ }
}
},
"builtin-modules": {
@@ -4329,14 +4360,14 @@
"integrity": "sha1-zl15f5fib4vnvv9T99xA4cGp7Ew="
},
"dmg-builder": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-5.3.1.tgz",
- "integrity": "sha512-/+vtqlgvTtha/4Gc76XIRKS2KzYO58sTWXhZ/kgfNr05ZXY6bIw26v7xDu8ZBpTYnfWI09JRZTMv1yIXT/vvfg==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.0.0.tgz",
+ "integrity": "sha512-nGeCoIctKP48QhohyQ6Uxx754XKyfVa5nx8YK6STIxTXoGTDWR/dwy8m4iCkM77//sd2wMdP9KYsUDuPxtbpLA==",
"dev": true,
"requires": {
- "app-builder-lib": "~20.28.3",
+ "app-builder-lib": "~20.29.0",
"bluebird-lst": "^1.0.5",
- "builder-util": "~6.1.3",
+ "builder-util": "~7.0.0",
"fs-extra-p": "^4.6.1",
"iconv-lite": "^0.4.24",
"js-yaml": "^3.12.0",
@@ -4537,24 +4568,24 @@
"dev": true
},
"electron-builder": {
- "version": "20.28.4",
- "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.28.4.tgz",
- "integrity": "sha512-JMOzMfx9BrC9SJr6+UacuvQZmuodL02Zua8iFn0l5bv32GkWcNj1D6FwybV33BpsmdQ8sF1SkQj+7L+FEIxang==",
+ "version": "20.29.0",
+ "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.29.0.tgz",
+ "integrity": "sha512-i1v5dD0u8tu5rq8Nq3DohEj/Gm7WKSysvlbeb5oCvmJ0YslbsQm/Iq6SGLTmJbXlYp3hoL3djuBaWC+oM2hagw==",
"dev": true,
"requires": {
- "app-builder-lib": "20.28.4",
+ "app-builder-lib": "20.29.0",
"bluebird-lst": "^1.0.5",
- "builder-util": "6.1.3",
- "builder-util-runtime": "4.4.1",
+ "builder-util": "7.0.0",
+ "builder-util-runtime": "5.0.0",
"chalk": "^2.4.1",
- "dmg-builder": "5.3.1",
+ "dmg-builder": "6.0.0",
"fs-extra-p": "^4.6.1",
- "is-ci": "^1.2.0",
+ "is-ci": "^1.2.1",
"lazy-val": "^1.0.3",
"read-config-file": "3.1.2",
"sanitize-filename": "^1.6.1",
"update-notifier": "^2.5.0",
- "yargs": "^12.0.1"
+ "yargs": "^12.0.2"
},
"dependencies": {
"ansi-regex": {
@@ -4945,9 +4976,9 @@
}
},
"electron-osx-sign": {
- "version": "0.4.10",
- "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.10.tgz",
- "integrity": "sha1-vk87ibKnWh3F8eckkIGrKSnKOiY=",
+ "version": "0.4.11",
+ "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz",
+ "integrity": "sha512-VVd40nrnVqymvFrY9ZkOYgHJOvexHHYTR3di/SN+mjJ0OWhR1I8BRVj3U+Yamw6hnkZZNKZp52rqL5EFAAPFkQ==",
"dev": true,
"requires": {
"bluebird": "^3.5.0",
@@ -4955,7 +4986,7 @@
"debug": "^2.6.8",
"isbinaryfile": "^3.0.2",
"minimist": "^1.2.0",
- "plist": "^2.1.0"
+ "plist": "^3.0.1"
},
"dependencies": {
"debug": {
@@ -4972,29 +5003,18 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true
- },
- "plist": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz",
- "integrity": "sha1-V8zbeggh3yGDEhejytVOPhRqECU=",
- "dev": true,
- "requires": {
- "base64-js": "1.2.0",
- "xmlbuilder": "8.2.2",
- "xmldom": "0.1.x"
- }
}
}
},
"electron-publish": {
- "version": "20.28.3",
- "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.28.3.tgz",
- "integrity": "sha512-/2t5zk9EKgH7p7rFZ+ynTKLmpKGF9bktMP2UR6u4bbPz9w4r3WEUbPOeZ1TLqUCAqdfZECcj4ThjrlcAJTghCA==",
+ "version": "20.29.0",
+ "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.29.0.tgz",
+ "integrity": "sha512-Kc5u5YaJLcGWPrp3bFk8NdrYk5gNVG4lZqbAIZnYNPuOLMCNgUk4UqrONO6iuAE6x/vWOoovszf1gGIT7G01UA==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.5",
- "builder-util": "~6.1.3",
- "builder-util-runtime": "^4.4.1",
+ "builder-util": "~7.0.0",
+ "builder-util-runtime": "^5.0.0",
"chalk": "^2.4.1",
"fs-extra-p": "^4.6.1",
"lazy-val": "^1.0.3",
@@ -8890,7 +8910,7 @@
"dev": true
},
"matrix-js-sdk": {
- "version": "github:matrix-org/matrix-js-sdk#01e31afcbd75d17b68c0b3209eb4bbcbef096457",
+ "version": "github:matrix-org/matrix-js-sdk#604af1ac8c180dcdddb761485eb03fad382bd06d",
"from": "github:matrix-org/matrix-js-sdk#develop",
"requires": {
"another-json": "^0.2.0",
@@ -8900,6 +8920,7 @@
"content-type": "^1.0.2",
"loglevel": "1.6.1",
"memfs": "^2.10.1",
+ "qs": "^6.5.2",
"request": "^2.88.0"
}
},
@@ -8963,8 +8984,8 @@
"from": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
},
"matrix-js-sdk": {
- "version": "github:matrix-org/matrix-js-sdk#01e31afcbd75d17b68c0b3209eb4bbcbef096457",
- "from": "github:matrix-org/matrix-js-sdk#01e31afcbd75d17b68c0b3209eb4bbcbef096457",
+ "version": "github:matrix-org/matrix-js-sdk#604af1ac8c180dcdddb761485eb03fad382bd06d",
+ "from": "github:matrix-org/matrix-js-sdk#604af1ac8c180dcdddb761485eb03fad382bd06d",
"requires": {
"another-json": "^0.2.0",
"babel-runtime": "^6.26.0",
@@ -10151,12 +10172,6 @@
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
"dev": true
- },
- "xmlbuilder": {
- "version": "9.0.7",
- "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
- "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
- "dev": true
}
}
},
@@ -11695,7 +11710,7 @@
},
"safe-regex": {
"version": "1.1.0",
- "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
"dev": true,
"requires": {
@@ -11995,9 +12010,9 @@
}
},
"slate-base64-serializer": {
- "version": "0.2.76",
- "resolved": "https://registry.npmjs.org/slate-base64-serializer/-/slate-base64-serializer-0.2.76.tgz",
- "integrity": "sha512-MhqVWN4YRL8bKlaBKbpo2dx8mPy4ilIwSOE0gzpiaxrLOJ2U4CigLGtS+mxzkzWkdL+3WIATnEE4g0ZCxPTePQ==",
+ "version": "0.2.77",
+ "resolved": "https://registry.npmjs.org/slate-base64-serializer/-/slate-base64-serializer-0.2.77.tgz",
+ "integrity": "sha512-EZ5XpKf7l2mYIzbB0rdExAZ5FPgm252hmDtR5wTBY5m79ekw/xc016HxJrlg0HufMQKcRsQtuEhBRrwyLiWuag==",
"requires": {
"isomorphic-base64": "^1.0.2"
}
@@ -12039,9 +12054,9 @@
}
},
"slate-plain-serializer": {
- "version": "0.6.15",
- "resolved": "https://registry.npmjs.org/slate-plain-serializer/-/slate-plain-serializer-0.6.15.tgz",
- "integrity": "sha512-gPHtJ+h8HBsUlRv6uJfVZpk1gGmCK1rriZEW1gWH8PmtKg2X46B8KNM1KtqJ4iAA3iADTtcWBB95/RiMC5i0yw=="
+ "version": "0.6.16",
+ "resolved": "https://registry.npmjs.org/slate-plain-serializer/-/slate-plain-serializer-0.6.16.tgz",
+ "integrity": "sha512-swQAe2ehGhsJWSOyGsmLWs/JSya5k8ipwOHpW1fy1hb1sU8BnU/0y9PMxGPCbpUugbSCFURmm6MPlj04Tc1/sg=="
},
"slate-prop-types": {
"version": "0.4.67",
@@ -14589,9 +14604,9 @@
"dev": true
},
"xmlbuilder": {
- "version": "8.2.2",
- "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
- "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=",
+ "version": "9.0.7",
+ "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+ "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
"dev": true
},
"xmldom": {
diff --git a/package.json b/package.json
index 627b4895..bec360a8 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "0.17.2",
+ "version": "0.17.6",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -44,7 +44,7 @@
"install:electron": "install-app-deps",
"electron": "npm run install:electron && electron .",
"start:res": "node scripts/copy-res.js -w",
- "start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development",
+ "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development",
"start:js:prod": "cross-env NODE_ENV=production webpack-dev-server -w --progress",
"start:js-sdk": "node scripts/npm-sub.js matrix-js-sdk run start:watch",
"start:js-sdk:prod": "cross-env NODE_ENV=production node scripts/npm-sub.js matrix-js-sdk run start:watch",
@@ -69,15 +69,15 @@
"favico.js": "^0.3.10",
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.2",
- "highlight.js": "^9.13.0",
- "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
- "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
+ "highlight.js": "^9.13.1",
+ "matrix-js-sdk": "0.14.0",
+ "matrix-react-sdk": "0.14.5",
"modernizr": "^3.6.0",
"prop-types": "^15.6.2",
"react": "^15.6.0",
"react-dom": "^15.6.0",
"sanitize-html": "^1.19.1",
- "ua-parser-js": "^0.7.18",
+ "ua-parser-js": "^0.7.19",
"url": "^0.11.0"
},
"devDependencies": {
@@ -100,7 +100,7 @@
"concurrently": "^4.0.1",
"cpx": "^1.3.2",
"cross-env": "^4.0.0",
- "electron-builder": "^20.28.4",
+ "electron-builder": "^20.29.0",
"electron-builder-squirrel-windows": "^11.6.1",
"electron-devtools-installer": "^2.2.4",
"emojione": "^2.2.7",
@@ -113,7 +113,7 @@
"fs-extra": "^0.30.0",
"html-webpack-plugin": "^3.2.0",
"json-loader": "^0.5.3",
- "karma": "^3.0.0",
+ "karma": "^3.1.1",
"karma-chrome-launcher": "^0.2.3",
"karma-cli": "^1.0.1",
"karma-junit-reporter": "^2.0.0",
@@ -123,9 +123,8 @@
"karma-spec-reporter": "0.0.31",
"karma-summary-reporter": "^1.5.1",
"karma-webpack": "4.0.0-beta.0",
- "matrix-mock-request": "^1.2.0",
+ "matrix-mock-request": "^1.2.2",
"matrix-react-test-utils": "^0.2.0",
- "memfs": "^2.10.1",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"mocha": "^5.2.0",
@@ -142,9 +141,9 @@
"react-addons-test-utils": "^15.6.0",
"rimraf": "^2.4.3",
"source-map-loader": "^0.2.4",
- "webpack": "^4.20.2",
+ "webpack": "^4.23.1",
"webpack-cli": "^3.1.2",
- "webpack-dev-server": "^3.1.9"
+ "webpack-dev-server": "^3.1.10"
},
"optionalDependencies": {
"olm": "https://matrix.org/packages/npm/olm/olm-3.0.0.tgz"
diff --git a/res/themes/status/css/_status.scss b/res/themes/status/css/_status.scss
index c99af14e..d01cfa52 100644
--- a/res/themes/status/css/_status.scss
+++ b/res/themes/status/css/_status.scss
@@ -68,6 +68,7 @@ $focus-bg-color: #dddddd;
// button UI (white-on-green in light skin)
$accent-fg-color: #ffffff;
$accent-color: #6CC1F6;
+$accent-color-50pct: #6CC1F67F;
$accent-hover-color: #84cfff;
$selection-fg-color: $primary-bg-color;
diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index ff8ee458..e41fa88f 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -25,6 +25,7 @@ const INCLUDE_LANGS = [
{'value': 'gl', 'label': 'Galego'},
{'value': 'hu', 'label': 'Magyar'},
{'value': 'it', 'label': 'Italiano'},
+ {'value': 'ja', 'label': '日本語'},
{'value': 'ko', 'label': '한국어'},
{'value': 'lv', 'label': 'Latviešu'},
{'value': 'nb_NO', 'label': 'Norwegian Bokmål'},
diff --git a/scripts/jenkins.sh b/scripts/jenkins.sh
index 7b5b4c8e..a0e88e4d 100755
--- a/scripts/jenkins.sh
+++ b/scripts/jenkins.sh
@@ -4,21 +4,23 @@ set -e
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-nvm use 6
+nvm use 10
set -x
-# check out corresponding branches of dependencies.
-#
-# clone the deps with depth 1: we know we will only ever need that one
-# commit.
-`dirname $0`/fetch-develop.deps.sh --depth 1
-
npm install
# apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
npm install olm
+# check out corresponding branches of dependencies.
+#
+# clone the deps with depth 1: we know we will only ever need that one
+# commit.
+# We need to do this after npm install otherwise modern node versions
+# just reset it back.
+`dirname $0`/fetch-develop.deps.sh --depth 1
+
# install olm. A naive 'npm i ./olm/olm-*.tgz' fails because it uses the url
# from our package.json (or even matrix-js-sdk's) in preference.
#
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 724ad2e7..acf1a2a9 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -34,5 +34,6 @@
"Dev chat for the Dendrite dev team": "Babilado por la programista skipo de Dendrite",
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Multaj ĉambroj jam ekzistas en Matrix; kaj sendependaj, kaj ligitaj kun jamaj retoj (Slock, IRC, Gitter, ktp.). Rigardu la ĉambrujon!",
"%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s je %(osName)s",
- "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.
You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix, per specifo de alia hejmservila URL.
Tio permesas al vi uzi klienton Riot kun jama konto de Matrix en alia hejmservilo.
Vi ankaŭ povas agordi propran identigan servilon, sed vi ne povos inviti uzantojn per retpoŝtadreso, aŭ esti invitata per retpoŝtadreso mem."
+ "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.
You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix, per specifo de alia hejmservila URL.
Tio permesas al vi uzi klienton Riot kun jama konto de Matrix en alia hejmservilo.
Vi ankaŭ povas agordi propran identigan servilon, sed vi ne povos inviti uzantojn per retpoŝtadreso, aŭ esti invitata per retpoŝtadreso mem.",
+ "Co-ordination for Riot translators": "Kunordigo por tradukantoj de Riot"
}
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index d941db19..b916254d 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -25,7 +25,7 @@
"Admin support for Dendrite": "Dendriteの管理者サポート",
"Announcements about Synapse releases": "Synapseの公開についてのお知らせ",
"Support for those using and running matrix-appservice-irc": "matrix-appservice-ircを利用並びに運営している方へのサポート",
- "Building services on Matrix": "Matrixでのサービスの開発",
+ "Building services on Matrix": "Matrix上でのサービスの開発",
"Support for those using the Matrix spec": "Matrixスペックを利用する方へのサポート",
"Design and implementation of E2E in Matrix": "Matrixのデザインとエンドツーエンドの実装",
"Implementing VR services with Matrix": "MatrixでのVRサービスの実装",
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index 2d6bd4eb..8d2cfdd3 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -1,9 +1,12 @@
{
- "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s %(browserName)s ద్వర %(osName)s కి",
+ "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s %(browserName)s ద్వార %(osName)s కి",
"Custom Server Options": "మలచిన సేవిక ఎంపికలు",
"Dismiss": "రద్దుచేసే",
"Riot Desktop on %(platformName)s": "రియట్ రంగస్థలం లో %(platformName)s",
"Welcome to Riot.im": "రిమోట్.ఇం కి స్వగతం",
"Search the room directory": "గది వివరాన్ని శోధించండి",
- "Chat with Riot Bot": "రియోట్ బొట్తో మాటామంతి చేయండి"
+ "Chat with Riot Bot": "రియోట్ బొట్తో మాటామంతి చేయండి",
+ "Unknown device": "తెలుయని పరికరం",
+ "You need to be using HTTPS to place a screen-sharing call.": "తెర ని పంచే కాల్ కి HTTPS అవసరం.",
+ "Riot is not supported on mobile web. Install the app?": "మొబైల్ బ్రౌజర్ లో రియట్ పనిచేయదు. ఆప్ ఇన్స్టాల్ చేయాలా?"
}
diff --git a/webpack.config.js b/webpack.config.js
index 464e87a4..f335aa3c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -106,21 +106,8 @@ module.exports = {
// same goes for js-sdk
"matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),
-
- // To make webpack happy
- // Related: https://github.com/request/request/issues/1529
- // (there's no mock available for fs, so we fake a mock by using
- // an in-memory version of fs)
- "fs": "memfs",
},
},
- node: {
- // Because webpack is made of fail
- // https://github.com/request/request/issues/1529
- // Note: 'mock' is the new 'empty'
- net: 'mock',
- tls: 'mock'
- },
externals: {
// Don't try to bundle electron: leave it as a commonjs dependency
// (the 'commonjs' here means it will output a 'require')