Merge branch 'develop' into travis/room-list-2

CHANGELOG.md

@@ -1,12 +1,45 @@
+Changes in [1.6.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.1) (2020-05-19)
+==============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.1-rc.1...v1.6.1)
+
+ * No changes since rc.1
+
+Changes in [1.6.1-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.1-rc.1) (2020-05-14)
+========================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0...v1.6.1-rc.1)
+
+ * Add CI scripts to install and link JS SDK
+   [\#85](https://github.com/vector-im/riot-desktop/pull/85)
+ * Use Xenial as the build image's base distribution
+   [\#84](https://github.com/vector-im/riot-desktop/pull/84)
+ * Persist GPG keys for Linux builds via Docker
+   [\#83](https://github.com/vector-im/riot-desktop/pull/83)
+ * Update README to mention profile support
+   [\#81](https://github.com/vector-im/riot-desktop/pull/81)
+ * Remove Conflicts from riot-desktop
+   [\#82](https://github.com/vector-im/riot-desktop/pull/82)
+ * Add a default Linux distribution
+   [\#79](https://github.com/vector-im/riot-desktop/pull/79)
+ * Remove invite only padlocks feature flag config
+   [\#77](https://github.com/vector-im/riot-desktop/pull/77)
+ * package.json: Bump the Seshat dep.
+   [\#75](https://github.com/vector-im/riot-desktop/pull/75)
+ * Remove encrypted message search feature flag
+   [\#74](https://github.com/vector-im/riot-desktop/pull/74)
+ * Update readme now it's the real source
+   [\#73](https://github.com/vector-im/riot-desktop/pull/73)
+
 Changes in [1.6.0](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0) (2020-05-05)
 ==============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.6...v1.6.0)
 
+ * No changes since rc.6
 
 Changes in [1.6.0-rc.6](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.6) (2020-05-01)
 ========================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.5...v1.6.0-rc.6)
 
+ * No changes since rc.5
 
 Changes in [1.6.0-rc.5](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.5) (2020-04-30)
 ========================================================================================================
@@ -21,6 +54,7 @@ Changes in [1.6.0-rc.4](https://github.com/vector-im/riot-desktop/releases/tag/v
 ========================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.3...v1.6.0-rc.4)
 
+ * No changes since rc.3
 
 Changes in [1.6.0-rc.3](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.3) (2020-04-17)
 ========================================================================================================
@@ -33,6 +67,7 @@ Changes in [1.6.0-rc.2](https://github.com/vector-im/riot-desktop/releases/tag/v
 ========================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.1...v1.6.0-rc.2)
 
+ * No changes since rc.1
 
 Changes in [1.6.0-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.1) (2020-04-15)
 ========================================================================================================

package.json

@@ -2,7 +2,7 @@
   "name": "riot-desktop",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -14,6 +14,7 @@
   "scripts": {
     "mkdirs": "mkdirp packages deploys",
     "fetch": "yarn run mkdirs && node scripts/fetch-package.js",
+    "asar-webapp": "asar p webapp webapp.asar",
     "start": "electron .",
     "lint": "eslint src/ scripts/ hak/",
     "build:native": "yarn run hak",
@@ -47,7 +48,7 @@
     "find-npm-prefix": "^1.0.2",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",
-    "matrix-js-sdk": "6.0.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "mkdirp": "^1.0.3",
     "needle": "^2.3.2",
     "node-pre-gyp": "^0.14.0",

riot.im/nightly/config.json

@@ -24,7 +24,9 @@
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs",
         "feature_custom_themes": "labs",
-        "feature_new_room_list": "labs"
+        "feature_new_room_list": "labs",
+        "feature_irc_ui": "labs",
+        "feature_font_scaling": "labs"
     },
     "piwik": {
         "url": "https://piwik.riot.im/",

yarn.lock

@@ -115,9 +115,9 @@ acorn-jsx@^5.0.0:
   integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
 acorn@^6.0.7:
-  version "6.4.0"
+  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
-  integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
 agent-base@4, agent-base@^4.3.0:
   version "4.3.0"
@@ -2862,10 +2862,9 @@ map-age-cleaner@^0.1.1:
   dependencies:
     p-defer "^1.0.0"
 
-matrix-js-sdk@6.0.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "6.0.0"
+  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0.tgz#2374a583878073871a0202dc237691ef15540575"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e3c6a0e1a08a3812ba988e60eb5a2a013bb27404"
-  integrity sha512-NBHb5JIKetCVhOdfETyhUL9lYs2M+v8W/uczTzW6IX9XFOtNaha8X82waXlRt6RJpZRm5aJveODkybvo9VOLtg==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"