From fce5b4dd786c359423c35cc4d8ae6c486c6aa74f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 9 Oct 2019 10:59:44 +0100 Subject: [PATCH 1/8] Enable Webpack production mode for start:js:prod The (rarely used) `start:js:prod` script for running production mode locally failed to set Webpack into production mode, so things like minification would be skipped. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40538deac1..630631ab57 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "electron": "yarn install:electron && electron .", "start:res": "node scripts/copy-res.js -w", "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:prod": "cross-env NODE_ENV=production webpack-dev-server -w --progress --mode production", "start:js-sdk": "node scripts/yarn-sub.js matrix-js-sdk start:watch", "start:js-sdk:prod": "cross-env NODE_ENV=production node scripts/yarn-sub.js matrix-js-sdk start:watch", "start:react-sdk": "node scripts/yarn-sub.js matrix-react-sdk start:all", From 1a36160c90abf71d6a503722df19932cacacc912 Mon Sep 17 00:00:00 2001 From: Claus Conrad Date: Tue, 8 Oct 2019 11:26:47 +0000 Subject: [PATCH 2/8] Translated using Weblate (Danish) Currently translated at 100.0% (24 of 24 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/da/ --- src/i18n/strings/da.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index 2c9b40183f..1f404351fd 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -38,7 +38,7 @@ "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Riot konfiguration indeholder ugyldig JSON. Venligst korrigér problemet og opdatér siden.", "The message from the parser is: %(message)s": "Beskeden fra parseren er: %(message)s", "Invalid JSON": "Ugyldig JSON", - "Your Riot is misconfigured": "Din Riot er fejlkonfigureret", + "Your Riot is misconfigured": "Din Riot er konfigureret forkert", "Unexpected error preparing the app. See console for details.": "Uventet fejl ved forberedelse af appen. Se konsollen for detaljer.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfiguration: kan kun angive en af default_server_config, default_server_name eller default_hs_url.", "Invalid configuration: no default server specified.": "Ugyldig konfiguration: ingen standardserver angivet.", From b6d1d0bf5dda5849808b49ba4a269b158a899441 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 9 Oct 2019 15:40:25 +0100 Subject: [PATCH 3/8] Bump Olm to 3.1.4 for olm_session_describe --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 630631ab57..bd05b090df 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "modernizr": "^3.6.0", - "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", + "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", "react-dom": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index d89fd004ba..b1eb8246f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6679,9 +6679,9 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -"olm@https://packages.matrix.org/npm/olm/olm-3.1.0.tgz": - version "3.1.0" - resolved "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz#2c8fc2a42b7ea12febc31baa73ec03d9b601da16" +"olm@https://packages.matrix.org/npm/olm/olm-3.1.4.tgz": + version "3.1.4" + resolved "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz#0f03128b7d3b2f614d2216409a1dfccca765fdb3" on-finished@~2.3.0: version "2.3.0" From a49e1a70dbc0545e96f2623d05f353ecbc7146cd Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 10 Oct 2019 14:20:40 +0100 Subject: [PATCH 4/8] Update default HS config to match well-known We want to move matrix.org client traffic to `https://matrix-client.matrix.org --- riot.im/app/config.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/riot.im/app/config.json b/riot.im/app/config.json index 164b81c1ae..dfcf5bd7a7 100644 --- a/riot.im/app/config.json +++ b/riot.im/app/config.json @@ -1,6 +1,13 @@ { - "default_hs_url": "https://matrix.org", - "default_is_url": "https://vector.im", + "default_server_config": { + "m.homeserver": { + "server_name": "matrix.org", + "base_url": "https://matrix-client.matrix.org" + }, + "m.identity_server": { + "base_url": "https://vector.im" + } + }, "brand": "Riot", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", From 19e0848698b6b7faf768ed8a8dc404a7566993e9 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 10 Oct 2019 14:21:37 +0100 Subject: [PATCH 5/8] Update develop config too --- riot.im/develop/config.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index a1f0b35b75..18c79e2ec2 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -1,6 +1,13 @@ { - "default_hs_url": "https://matrix.org", - "default_is_url": "https://vector.im", + "default_server_config": { + "m.homeserver": { + "server_name": "matrix.org", + "base_url": "https://matrix-client.matrix.org" + }, + "m.identity_server": { + "base_url": "https://vector.im" + } + }, "brand": "Riot", "integrations_ui_url": "https://scalar-staging.vector.im/", "integrations_rest_url": "https://scalar-staging.vector.im/api", From 0533e559aed768d37bb38e7d4a9bf0eed8d55634 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 10 Oct 2019 14:35:10 +0100 Subject: [PATCH 6/8] Update config.json --- riot.im/app/config.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/riot.im/app/config.json b/riot.im/app/config.json index dfcf5bd7a7..70ecddfdac 100644 --- a/riot.im/app/config.json +++ b/riot.im/app/config.json @@ -1,13 +1,5 @@ { - "default_server_config": { - "m.homeserver": { - "server_name": "matrix.org", - "base_url": "https://matrix-client.matrix.org" - }, - "m.identity_server": { - "base_url": "https://vector.im" - } - }, + "default_server_name": "matrix.org", "brand": "Riot", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", From 76ce2504212bd7ea54f7df1f2eb2215c762e421c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 10 Oct 2019 14:35:56 +0100 Subject: [PATCH 7/8] Update config.json --- riot.im/develop/config.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 18c79e2ec2..f028ab970e 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -1,13 +1,5 @@ { - "default_server_config": { - "m.homeserver": { - "server_name": "matrix.org", - "base_url": "https://matrix-client.matrix.org" - }, - "m.identity_server": { - "base_url": "https://vector.im" - } - }, + "default_server_name": "matrix.org", "brand": "Riot", "integrations_ui_url": "https://scalar-staging.vector.im/", "integrations_rest_url": "https://scalar-staging.vector.im/api", From 82286d45edb6d8207f12a37ef08ba43a9b914569 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 10 Oct 2019 15:50:19 +0100 Subject: [PATCH 8/8] Update config.json --- electron_app/riot.im/config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index a2df3da047..9887e025bc 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -1,7 +1,6 @@ { "update_base_url": "https://packages.riot.im/desktop/update/", - "default_hs_url": "https://matrix.org", - "default_is_url": "https://vector.im", + "default_server_name": "matrix.org", "brand": "Riot", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api",