From f7bb2c02fbb07a2f777096082674839f85284cff Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 30 Oct 2019 16:50:31 +0000 Subject: [PATCH 01/70] js-sdk & react-sdk rc.1 --- package.json | 4 ++-- yarn.lock | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 84f18a80..c5fade13 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "2.4.3-rc.1", + "matrix-react-sdk": "1.7.1-rc.1", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 9b520a5b..c4b2745c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5950,9 +5950,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "2.4.2" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/46d7e4c7075386f1330d6a49941e9979fc26be0a" +matrix-js-sdk@2.4.3-rc.1: + version "2.4.3-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.3-rc.1.tgz#c06452b89c74976ac0bae0732325c0b359e6f2fa" + integrity sha512-aV70H10lSpjAOmnWDXIWc2CP5D1OylwSSfyc61QzjvGhECEYaiQi4rxH4ZFhX9AL3ezPHse7SY6AmKOCfqBQiw== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5973,9 +5974,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "1.7.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/53332018234fc9067c6200babb794ab3538a0791" +matrix-react-sdk@1.7.1-rc.1: + version "1.7.1-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.1-rc.1.tgz#f38c894882554b5dd657a2a9bdcd3bae36aeb1bf" + integrity sha512-5Puz0b16eBun/1/IpV8x6xHm1qlJPHQvDbsr6LwwLSOXlqbTM2xG01h9opM06/HI9G2jVKnab9/K9KyXx2PiiQ== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -6006,7 +6008,7 @@ matrix-mock-request@^1.2.3: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "4.2" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "2.4.3-rc.1" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From ce1bc98ae67a50fad269a9a030c701279b100b2a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 30 Oct 2019 16:50:56 +0000 Subject: [PATCH 02/70] v1.5.1-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 30012970..00de2a7f 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.0", + "version": "1.5.1-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 5b8c5c06013101a18c04c4c1b862af6d7dced244 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 30 Oct 2019 16:51:57 +0000 Subject: [PATCH 03/70] Prepare changelog for v1.5.1-rc.1 --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a742a16..c3e2cc9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,36 @@ +Changes in [1.5.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1-rc.1) (2019-10-30) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.0...v1.5.1-rc.1) + + * Add ability to hide tray icon on non-Mac (which has no tray icon) + [\#11258](https://github.com/vector-im/riot-web/pull/11258) + * Fix bug preventing display from sleeping after a call + [\#11264](https://github.com/vector-im/riot-web/pull/11264) + * Remove mention of CI scripts from docs + [\#11257](https://github.com/vector-im/riot-web/pull/11257) + * Fix skinning replaces being broken since being rewritten as React FC's + [\#11254](https://github.com/vector-im/riot-web/pull/11254) + * Update config docs about identity servers + [\#11249](https://github.com/vector-im/riot-web/pull/11249) + * Remove unneeded help about identity servers + [\#11248](https://github.com/vector-im/riot-web/pull/11248) + * Update from Weblate + [\#11243](https://github.com/vector-im/riot-web/pull/11243) + * Update sample config for new matrix.org CS API URL + [\#11207](https://github.com/vector-im/riot-web/pull/11207) + * clarify where the e2e tests are located + [\#11115](https://github.com/vector-im/riot-web/pull/11115) + * Update from Weblate + [\#11171](https://github.com/vector-im/riot-web/pull/11171) + * Prevent referrers from being sent + [\#6155](https://github.com/vector-im/riot-web/pull/6155) + * Add darkModeSupport to allow dark themed title bar. + [\#11140](https://github.com/vector-im/riot-web/pull/11140) + * Fix the label of Turkish language + [\#11124](https://github.com/vector-im/riot-web/pull/11124) + * Update default HS config to match well-known + [\#11112](https://github.com/vector-im/riot-web/pull/11112) + Changes in [1.5.0](https://github.com/vector-im/riot-web/releases/tag/v1.5.0) (2019-10-18) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.0-rc.1...v1.5.0) From 35d1222cba6683de7306f819dc44eda5c12ac72d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 30 Oct 2019 16:51:57 +0000 Subject: [PATCH 04/70] v1.5.1-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c5fade13..973483f5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.0", + "version": "1.5.1-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 1b4f4b6b65d754d5dfa78939d4f9c544865048a9 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 31 Oct 2019 13:21:15 -0600 Subject: [PATCH 05/70] Add labs documentation for Mjolnir --- docs/labs.md | 6 ++++++ riot.im/develop/config.json | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/labs.md b/docs/labs.md index ae2c72a4..7a3600b3 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -49,3 +49,9 @@ That's it. Now should see your new counter under the header. ## Multiple integration managers (`feature_many_integration_managers`) Exposes a way to access all the integration managers known to Riot. This is an implementation of [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957). + +## New ways to ignore people (`feature_mjolnir`) + +When enabled, a new settings tab appears for users to be able to manage their ban lists. +This is a different kind of ignoring where the ignored user's messages still get rendered, +but are hidden by default. diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index f028ab97..ed31d62a 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -27,7 +27,8 @@ "feature_sas": "labs", "feature_room_breadcrumbs": "labs", "feature_state_counters": "labs", - "feature_many_integration_managers": "labs" + "feature_many_integration_managers": "labs", + "feature_mjolnir": "labs" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": { From ec091ce8dee4c0296a1d9f08119ea0d3e69f2198 Mon Sep 17 00:00:00 2001 From: MamasLT Date: Fri, 1 Nov 2019 04:17:20 +0000 Subject: [PATCH 06/70] Translated using Weblate (Lithuanian) Currently translated at 100.0% (23 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lt/ --- src/i18n/strings/lt.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json index 6c1e8f1b..2c588830 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -8,8 +8,8 @@ "Riot is not supported on mobile web. Install the app?": "Riot nėra palaikoma naršant svetainėje mobiliaisiais įrenginiais. Įdiegti programėlę?", "Riot Desktop on %(platformName)s": "Riot Desktop, naudojant %(platformName)s", "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s, naudojant %(osName)s", - "You need to be using HTTPS to place a screen-sharing call.": "Norint skambinti su ekrano bendrinimo funkcija būtina naudoti HTTPS.", - "Custom Server Options": "Tinkinto serverio parametrai", + "You need to be using HTTPS to place a screen-sharing call.": "Norint skambinti naudojant ekrano vaizdo dalijimosi funkciją, jūs turite naudoti HTTPS.", + "Custom Server Options": "Pasirinktiniai Serverio Nustatymai", "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.": "Norėdami prisijungti prie kito nei Matrix serverio, galite naudoti tinkinto serverio parametrus ir nurodyti kito serverio URL adresą.
Tai leis jums naudoti Riot su esama Matrix paskyra kituose serveriuose.

Taip pat galite nustatyti tinkintą tapatybės serverį, tačiau tuomet negalėsite pakviesti kitus naudotojus pagal el. paštą, o taip pat ir jie negalės pakviesti jūsų.", "Dismiss": "Atmesti", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizuoti, šifruoti pokalbiai ir bendradarbiavimas, veikiantis su [matrix]", @@ -40,5 +40,13 @@ "Create Account": "Sukurti paskyrą", "Need help?": "Reikia pagalbos?", "Explore rooms": "Peržiūrėti kambarius", - "Room Directory": "Kambarių katalogas" + "Room Directory": "Kambarių katalogas", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Jūsų Riot konfigūracijoje yra klaidingas JSON. Prašome pataisyti problemą ir iš naujo užkrauti puslapį.", + "The message from the parser is: %(message)s": "Analizatoriaus žinutė yra: %(message)s", + "Invalid JSON": "Klaidingas JSON", + "Your Riot is misconfigured": "Jūsų Riot yra neteisingai sukonfigūruotas", + "Unexpected error preparing the app. See console for details.": "Netikėta klaida ruošiant programą. Norėdami sužinoti daugiau detalių, žiūrėkite konsolę.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Klaidinga konfigūracija: galima nurodyti tik vieną iš default_server_config, default_server_name, arba default_hs_url.", + "Invalid configuration: no default server specified.": "Klaidinga konfigūracija: nenurodytas numatytasis serveris.", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Jūs galite naudoti pasirinktinius serverio nustatymus, kad prisijungtumėte prie kitų Matrix serverių, nurodydami kito serverio URL. Tai leidžia jums naudotis Riot su esama Matrix paskyra kitame serveryje." } From 0c18f944cc0a4cbb76bdbb5d7fea93012e9aefbb Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 1 Nov 2019 10:22:09 +0000 Subject: [PATCH 07/70] react-sdk rc.2 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 973483f5..1d5fbfa5 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "2.4.3-rc.1", - "matrix-react-sdk": "1.7.1-rc.1", + "matrix-react-sdk": "1.7.1-rc.2", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index c4b2745c..90ef6c6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5974,10 +5974,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.7.1-rc.1: - version "1.7.1-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.1-rc.1.tgz#f38c894882554b5dd657a2a9bdcd3bae36aeb1bf" - integrity sha512-5Puz0b16eBun/1/IpV8x6xHm1qlJPHQvDbsr6LwwLSOXlqbTM2xG01h9opM06/HI9G2jVKnab9/K9KyXx2PiiQ== +matrix-react-sdk@1.7.1-rc.2: + version "1.7.1-rc.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.1-rc.2.tgz#d627390d7f88df23d1ffe89979699dab3cd7aed7" + integrity sha512-q3o2U/aZlgm8+sAax0yLBmdfyXehGR5dMZdSxEUmLFIA0BREXwLoasp01uTJBCN5E0XANl2vmGjxNlqyLJV8zg== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" From 37119efec9b5fb426674fbb5f85dfec5b73260ce Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 1 Nov 2019 10:22:34 +0000 Subject: [PATCH 08/70] v1.5.1-rc.2 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 00de2a7f..5a938287 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.1-rc.1", + "version": "1.5.1-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From a98c0526645320544aeb2db8334907346f44b1c3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 1 Nov 2019 10:24:28 +0000 Subject: [PATCH 09/70] Prepare changelog for v1.5.1-rc.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3e2cc9f..07ccc752 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.5.1-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.1-rc.2) (2019-11-01) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.1...v1.5.1-rc.2) + + * Updated react-sdk with fix for bug that caused room filtering to + omit results. + Changes in [1.5.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1-rc.1) (2019-10-30) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.0...v1.5.1-rc.1) From 3ba3c1b8819553dbc3d74c36e77a6b5826e603d7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 1 Nov 2019 10:24:29 +0000 Subject: [PATCH 10/70] v1.5.1-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d5fbfa5..11354ab6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.1-rc.1", + "version": "1.5.1-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From ffa4616acf6db8fa033b0ab3cd2b9129c5d9b4f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 31 Oct 2019 10:11:00 +0000 Subject: [PATCH 11/70] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 78.3% (18 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/ --- src/i18n/strings/nb_NO.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json index 97898f52..64a0a9a9 100644 --- a/src/i18n/strings/nb_NO.json +++ b/src/i18n/strings/nb_NO.json @@ -30,5 +30,7 @@ "Create Account": "Lag konto", "Need help?": "Trenger du hjelp?", "Room Directory": "Alle rom", - "Explore rooms": "Se alle rom" + "Explore rooms": "Se alle rom", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot-konfigurasjonen din inneholder ugyldig JSON. Vennligst fiks problemet og oppdater siden.", + "The message from the parser is: %(message)s": "Meldingen fra parseren er: %(message)s" } From 5c747f9db64c9f75397bc321d6f34b79ee24a428 Mon Sep 17 00:00:00 2001 From: Elwyn Malethan Date: Sun, 3 Nov 2019 11:35:38 +0000 Subject: [PATCH 12/70] Added translation using Weblate (Welsh) --- src/i18n/strings/cy.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/i18n/strings/cy.json diff --git a/src/i18n/strings/cy.json b/src/i18n/strings/cy.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/i18n/strings/cy.json @@ -0,0 +1 @@ +{} From 7e3eee259164c47d628a1f1c26708cf761f5fa76 Mon Sep 17 00:00:00 2001 From: shuji narazaki Date: Sun, 3 Nov 2019 05:54:43 +0000 Subject: [PATCH 13/70] Translated using Weblate (Japanese) Currently translated at 100.0% (23 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/ --- src/i18n/strings/ja.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 022f721c..4e5d007f 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -10,7 +10,7 @@ "powered by Matrix": "Matrix の支援により活動しています。", "Riot Desktop on %(platformName)s": "%(platformName)s向けデスクトップ版Riot", "You need to be using HTTPS to place a screen-sharing call.": "画面共有通話を行うにはHTTPS通信を使う必要があります。", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "分散型の、暗号化された会話とコラボレーション。[matrix]で動作しています", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "[matrix]が支援する、分散型で暗号化された会話とコラボレーション", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "既にたくさんの部屋が、既存のネットワーク（Slack、IRC、Gitter等）に接続して、または独立的にMatrixに存在します。ディレクトリを検索してください！", "Chat with Riot Bot": "Riot Botと会話", "Get started with some tips from Riot Bot!": "Riot Botにヒントをもらって始めましょう！", @@ -43,5 +43,10 @@ "Create Account": "アカウントを作成する", "Need help?": "助けが必要ですか？", "Explore rooms": "部屋を探索する", - "Room Directory": "部屋のディレクトリー" + "Room Directory": "部屋のディレクトリー", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riotの設定に妥当でないJSONが含まれています。問題を修正してページを再読みしてください。", + "The message from the parser is: %(message)s": "パーザーのメッセージ: %(message)s", + "Invalid JSON": "妥当でないJSON", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "無効な設定: default_server_config、default_server_name、または default_hs_urlのいずれか一つのみが指定できます。", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "サーバーのカスタムオプションに別のホームサーバーURLを指定することで他のMatrixサーバーにサインインすることができます。これにより別のホームサーバー上で既にあるMatrixのアカウントでRiotを使うことができます。" } From 6d553d1ecd76c0c4665364412336c0e0dd8c52a3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 15:14:59 +0000 Subject: [PATCH 14/70] Released react-sdk & js-sdk --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 11354ab6..8b79b5f3 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.4.3-rc.1", - "matrix-react-sdk": "1.7.1-rc.2", + "matrix-js-sdk": "2.4.3", + "matrix-react-sdk": "1.7.1", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 90ef6c6e..46066770 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5950,10 +5950,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -matrix-js-sdk@2.4.3-rc.1: - version "2.4.3-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.3-rc.1.tgz#c06452b89c74976ac0bae0732325c0b359e6f2fa" - integrity sha512-aV70H10lSpjAOmnWDXIWc2CP5D1OylwSSfyc61QzjvGhECEYaiQi4rxH4ZFhX9AL3ezPHse7SY6AmKOCfqBQiw== +matrix-js-sdk@2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.3.tgz#23b78cc707a02eb0ce7eecb3aa50129e46dd5b6e" + integrity sha512-8qTqILd/NmTWF24tpaxmDIzkTk/bZhPD5N8h69PlvJ5Y6kMFctpRj+Tud5zZjl5/yhO07+g+JCyDzg+AagiM/A== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5974,10 +5974,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.7.1-rc.2: - version "1.7.1-rc.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.1-rc.2.tgz#d627390d7f88df23d1ffe89979699dab3cd7aed7" - integrity sha512-q3o2U/aZlgm8+sAax0yLBmdfyXehGR5dMZdSxEUmLFIA0BREXwLoasp01uTJBCN5E0XANl2vmGjxNlqyLJV8zg== +matrix-react-sdk@1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.1.tgz#279b556dd24aae1ff13d10b261521055cdf9c7e4" + integrity sha512-y5sOCMHZvZRyWcJnaK5bk6oiq6hIO3bSJy3GNqL8yRozt3CPZzHDG9ripf3EQ+hmGilKV9sfPZw173CxZROwDw== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -6008,7 +6008,7 @@ matrix-react-sdk@1.7.1-rc.2: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "4.2" - matrix-js-sdk "2.4.3-rc.1" + matrix-js-sdk "2.4.3" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From f48ca740fc7a578c23df653bb964dadce7b2136b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 15:15:52 +0000 Subject: [PATCH 15/70] v1.5.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 5a938287..adf119e0 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.1-rc.2", + "version": "1.5.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From dd4f5131c7cf4475162fa4ded43db01c0f88cade Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 15:17:30 +0000 Subject: [PATCH 16/70] Prepare changelog for v1.5.1 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07ccc752..300f9799 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.5.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1) (2019-11-04) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.2...v1.5.1) + + * No changes since rc.2 + Changes in [1.5.1-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.1-rc.2) (2019-11-01) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.1...v1.5.1-rc.2) From fb64a0a46cff61b683764897f824b8a587dabc91 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 15:17:30 +0000 Subject: [PATCH 17/70] v1.5.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b79b5f3..6f8a6628 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.1-rc.2", + "version": "1.5.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 7a7ea8c7f6c1f3fbe631316d9b16b68e5b162d42 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 4 Nov 2019 15:33:25 +0000 Subject: [PATCH 18/70] I meant 6.1.2. There is no 6.1.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f8a6628..bf23ac56 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "6.1.12", + "electronVersion": "6.1.2", "files": [ "node_modules/**", "src/**" From b56a97ab3dceee9389a02a2cfea5b09ec2aa0e62 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 4 Nov 2019 16:26:57 +0000 Subject: [PATCH 19/70] Expose feature_user_info_panel on riot.im/develop --- riot.im/develop/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index f028ab97..39098822 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -27,7 +27,8 @@ "feature_sas": "labs", "feature_room_breadcrumbs": "labs", "feature_state_counters": "labs", - "feature_many_integration_managers": "labs" + "feature_many_integration_managers": "labs", + "feature_user_info_panel": "labs" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": { From f3656c27924839b1f37ee979b4c82c3ebec3c935 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 4 Nov 2019 16:51:04 +0000 Subject: [PATCH 20/70] Add dependency to eslint-plugin-react-hooks as react-sdk did --- package.json | 1 + yarn.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/package.json b/package.json index 84f18a80..2746d3a2 100644 --- a/package.json +++ b/package.json @@ -117,6 +117,7 @@ "eslint-plugin-babel": "^4.1.2", "eslint-plugin-flowtype": "^2.50.3", "eslint-plugin-react": "^7.11.1", + "eslint-plugin-react-hooks": "^2.2.0", "expect": "^1.16.0", "file-loader": "^3.0.1", "fs-extra": "^0.30.0", diff --git a/yarn.lock b/yarn.lock index 9b520a5b..4aaf8db7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3364,6 +3364,11 @@ eslint-plugin-flowtype@^2.50.3: dependencies: lodash "^4.17.10" +eslint-plugin-react-hooks@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.2.0.tgz#078264e9e388da6929ace09d6abe92c85963aff4" + integrity sha512-jSlnBjV2cmyIeL555H/FbvuSbQ1AtpHjLMHuPrQnt1eVA6lX8yufdygh7AArI2m8ct7ChHGx2uOaCuxq2MUn6g== + eslint-plugin-react@^7.11.1: version "7.14.3" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz#911030dd7e98ba49e1b2208599571846a66bdf13" From 03887f9d1bce2c952fb1866e7ef436387f391515 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 4 Nov 2019 18:02:33 +0000 Subject: [PATCH 21/70] Fix close window behaviour on Macos --- electron_app/src/electron-main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 48a425c9..7e65c534 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -393,7 +393,7 @@ app.on('ready', () => { }); mainWindow.on('close', (e) => { // If we are not quitting and have a tray icon then minimize to tray - if (!global.appQuitting && tray.hasTray()) { + if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) { // On Mac, closing the window just hides it // (this is generally how single-window Mac apps // behave, eg. Mail.app) From fbd5ffc1987a31e7913174eb90577574d404ed1c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 4 Nov 2019 18:02:33 +0000 Subject: [PATCH 22/70] Fix close window behaviour on Macos --- electron_app/src/electron-main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 48a425c9..7e65c534 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -393,7 +393,7 @@ app.on('ready', () => { }); mainWindow.on('close', (e) => { // If we are not quitting and have a tray icon then minimize to tray - if (!global.appQuitting && tray.hasTray()) { + if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) { // On Mac, closing the window just hides it // (this is generally how single-window Mac apps // behave, eg. Mail.app) From 6f85fc9e8cf4368eaf6985223d0ecbd1a96e60a6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 18:27:35 +0000 Subject: [PATCH 23/70] v1.5.2 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index adf119e0..f141aa6b 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.1", + "version": "1.5.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 3cd7e1c18cf9725635a614c0e18e70d1dbaee1a6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 18:30:36 +0000 Subject: [PATCH 24/70] Prepare changelog for v1.5.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 300f9799..7ee93d5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.5.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.2) (2019-11-04) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1...v1.5.2) + + * Fix close window behaviour on Macos + [\#11311](https://github.com/vector-im/riot-web/pull/11311) + Changes in [1.5.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1) (2019-11-04) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.2...v1.5.1) From 17027cb5155deb0496fc8b68709988dca5c3510a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 18:30:37 +0000 Subject: [PATCH 25/70] v1.5.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf23ac56..c696840f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.1", + "version": "1.5.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From e006e92255215d679cf38108bb5d9d91c535e06c Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 4 Nov 2019 18:56:41 +0000 Subject: [PATCH 26/70] Upgrade electron-notarize To include https://github.com/electron/electron-notarize/pull/14 --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 455e4425..03239eec 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "electron-builder": "^21.2.0", "electron-builder-squirrel-windows": "^21.2.0", "electron-devtools-installer": "^2.2.4", - "electron-notarize": "^0.1.1", + "electron-notarize": "^0.2.0", "eslint": "^5.8.0", "eslint-config-google": "^0.7.1", "eslint-plugin-babel": "^4.1.2", diff --git a/yarn.lock b/yarn.lock index 4e5ec98f..82c8137a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3134,13 +3134,13 @@ electron-devtools-installer@^2.2.4: rimraf "^2.5.2" semver "^5.3.0" -electron-notarize@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.1.1.tgz#c3563d70c5e7b3315f44e8495b30050a8c408b91" - integrity sha512-TpKfJcz4LXl5jiGvZTs5fbEx+wUFXV5u8voeG5WCHWfY/cdgdD8lDZIZRqLVOtR3VO+drgJ9aiSHIO9TYn/fKg== +electron-notarize@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.2.0.tgz#676c71688ee84149bab27b22426d0a9452e7e262" + integrity sha512-u3KdEMOEcGMF9yCML8ej4ZF+O29VmGYIjrs/DoOi23neTWOMiIc5YCeFs4vxq3JG496omcw7Y5pimPm0sH9A7g== dependencies: debug "^4.1.1" - fs-extra "^8.0.1" + fs-extra "^8.1.0" electron-publish@21.2.0: version "21.2.0" @@ -4096,7 +4096,7 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^8.0.1, fs-extra@^8.1.0: +fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== From 7af68bddeabd7e527147c9fb9a0f292ece3f1871 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Nov 2019 20:31:08 +0000 Subject: [PATCH 27/70] Remove the 'auto hide menu bar' option on Mac The menu bar is at the top of the screen on Mac so this setting does absolutely nothing. --- src/vector/platform/ElectronPlatform.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index dd4df4e6..78dce498 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -200,7 +200,8 @@ export default class ElectronPlatform extends VectorBasePlatform { } supportsAutoHideMenuBar(): boolean { - return true; + // This is irelevant on Mac as Menu bars don't live in the app window + return !navigator.platform.toUpperCase().includes('MAC'); } async getAutoHideMenuBarEnabled(): boolean { From 146ccc37a295b2e5574edc589dd9272fe08152a6 Mon Sep 17 00:00:00 2001 From: dreamerchris Date: Tue, 5 Nov 2019 11:34:45 +0000 Subject: [PATCH 28/70] Translated using Weblate (Greek) Currently translated at 100.0% (23 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/ --- src/i18n/strings/el.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index 3a8d21d2..43eff0e4 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -4,11 +4,11 @@ "Dismiss": "Απόρριψη", "Riot Desktop on %(platformName)s": "Riot Desktop σε %(platformName)s", "Unknown device": "Άγνωστη συσκευή", - "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για το διαμοιρασμό της επιφάνειας εργασίας μέσω κλήσης.", + "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για την πραγματοποίηση κλήσης διαμοιρασμού επιφάνειας εργασίας.", "Riot is not supported on mobile web. Install the app?": "Το Riot δεν υποστηρίζεται από περιηγητές κινητών. Θέλετε να εγκαταστήσετε την εφαρμογή;", - "powered by Matrix": "με τη βοήθεια του Matrix", + "powered by Matrix": "λειτουργεί με το Matrix", "Welcome to Riot.im": "Καλώς ήλθατε στο Riot.im", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία & συνεργασία με τη βοήθεια του [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία και συνεργασία χρησιμοποιώντας το [matrix]", "Search the room directory": "Αναζήτηση στο ευρετήριο δωματίων", "Chat with Riot Bot": "Συνομιλία με το Riot Bot", "Get started with some tips from Riot Bot!": "Ξεκινήστε με μερικές συμβουλές από το Riot Bot!", @@ -39,5 +39,14 @@ "Sign In": "Σύνδεση", "Create Account": "Δημιουργία Λογαριασμού", "Need help?": "Χρειάζεστε βοήθεια;", - "Room Directory": "Ευρετήριο δωματίων" + "Room Directory": "Ευρετήριο δωματίων", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Η ρύθμιση παραμέτρων σας του Riot περιλαμβάνει μη έγκυρο JSON. Παρακαλώ διορθώστε το πρόβλημα και επαναφορτώστε την σελίδα.", + "The message from the parser is: %(message)s": "Το μήνυμα από τον αναλυτή είναι: %(message)s", + "Invalid JSON": "Μη έγκυρο JSON", + "Your Riot is misconfigured": "Οι παράμετροι του Riot σας είναι λανθασμένα ρυθμισμένοι", + "Unexpected error preparing the app. See console for details.": "Απρόοπτο σφάλμα κατά την προετοιμασία της εφαρμογής. Δείτε το τερματικό για λεπτομέρειες.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Μη έγκυρη ρύθμιση παραμέτρων: δυνατότητα ορισμού μόνο ένα από τα default_server_config, default_server_name, ή default_hs_url.", + "Invalid configuration: no default server specified.": "Μη έγκυρη ρύθμιση παραμέτρων: δεν έχει οριστεί προκαθορισμένος διακομιστής.", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Μπορείτε να χρησιμοποιήσετε τις επιλογές προσαρμοσμένου διακομιστή για να κάνετε σύνδεση σε άλλους διακομιστές Matrix με το να ορίσετε διαφορετικό URL διακομιστή φιλοξενίας. Αυτό σας επιτρέπει να χρησιμοποιήσετε το Riot με έναν υπάρχον λογαριασμό Matrix σε ένα διαφορετικό διακομιστή φιλοξενίας.", + "Explore rooms": "Εξερευνήστε δωμάτια" } From 15c0561588b7e9b37ecbfe8595c56a22c7eba0a2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 6 Nov 2019 14:24:59 +0000 Subject: [PATCH 29/70] released react-sdk --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 03239eec..fc1c95af 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "2.4.3", - "matrix-react-sdk": "1.7.1", + "matrix-react-sdk": "1.7.2", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 82c8137a..3a7cc580 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5979,10 +5979,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.1.tgz#279b556dd24aae1ff13d10b261521055cdf9c7e4" - integrity sha512-y5sOCMHZvZRyWcJnaK5bk6oiq6hIO3bSJy3GNqL8yRozt3CPZzHDG9ripf3EQ+hmGilKV9sfPZw173CxZROwDw== +matrix-react-sdk@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.2.tgz#4c16fa6c2d188311ecb5163773dfdf7ca92b7ecc" + integrity sha512-CWCr41sRBeUChlvec6eJxmY02g+Re6PN3lt9tR7TkqGKyUu++Y72WPfirM+0t11QVtVyZ5Wo1WIzpropLBFyYw== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" From f52230559313591704b7b5c84d5e5e438dd7f281 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Nov 2019 14:26:45 +0000 Subject: [PATCH 30/70] Bump to electron 6.1.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fc1c95af..08c6a5d7 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "6.1.2", + "electronVersion": "6.1.4", "files": [ "node_modules/**", "src/**" From a13fbab4e4a9f68da12fbe61fb41811987949477 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 6 Nov 2019 14:27:50 +0000 Subject: [PATCH 31/70] v1.5.3 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index f141aa6b..2b75dadb 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.2", + "version": "1.5.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From ab180bc98de694ab9aa957e72f0f3aae14ee6536 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 6 Nov 2019 14:28:58 +0000 Subject: [PATCH 32/70] Prepare changelog for v1.5.3 --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ee93d5b..81073c98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +Changes in [1.5.3](https://github.com/vector-im/riot-web/releases/tag/v1.5.3) (2019-11-06) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.2...v1.5.3) + + * Remove the 'auto hide menu bar' option on Mac + [\#11326](https://github.com/vector-im/riot-web/pull/11326) + * Expose feature_user_info_panel on riot.im/develop + [\#11304](https://github.com/vector-im/riot-web/pull/11304) + * Upgrade electron-notarize + [\#11312](https://github.com/vector-im/riot-web/pull/11312) + * Fix close window behaviour on Macos + [\#11309](https://github.com/vector-im/riot-web/pull/11309) + * Merge: Add dependency to eslint-plugin-react-hooks as react-sdk did + [\#11307](https://github.com/vector-im/riot-web/pull/11307) + * Add dependency to eslint-plugin-react-hooks as react-sdk did + [\#11306](https://github.com/vector-im/riot-web/pull/11306) + * Update from Weblate + [\#11300](https://github.com/vector-im/riot-web/pull/11300) + Changes in [1.5.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.2) (2019-11-04) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1...v1.5.2) From 5bc15cf83cc658579ab9d0de44771d87b4bf1c4d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 6 Nov 2019 14:28:59 +0000 Subject: [PATCH 33/70] v1.5.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 08c6a5d7..b3c19525 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.2", + "version": "1.5.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 956c199fcfa26e6122b3000548d9c0b6143c687f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 6 Nov 2019 12:25:34 -0700 Subject: [PATCH 34/70] Add some docs to describe Mjolnir and Ban Lists --- docs/labs.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/labs.md b/docs/labs.md index 7a3600b3..0c1fb7d0 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -55,3 +55,7 @@ Exposes a way to access all the integration managers known to Riot. This is an i When enabled, a new settings tab appears for users to be able to manage their ban lists. This is a different kind of ignoring where the ignored user's messages still get rendered, but are hidden by default. + +Ban lists are rooms within Matrix, proposed as [MSC2313](https://github.com/matrix-org/matrix-doc/pull/2313). +[Mjolnir](https://github.com/matrix-org/mjolnir) is a set of moderation tools which support +ban lists. From 5e4e382dec883f725e2cdf0e8d41775de3af2435 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 7 Nov 2019 15:01:39 +0000 Subject: [PATCH 35/70] Remove unused feature flags --- riot.im/app/config.json | 2 -- riot.im/develop/config.json | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/riot.im/app/config.json b/riot.im/app/config.json index 70ecddfd..974c30c2 100644 --- a/riot.im/app/config.json +++ b/riot.im/app/config.json @@ -25,8 +25,6 @@ } }, "features": { - "feature_lazyloading": "enable", - "feature_room_breadcrumbs": "labs" }, "roomDirectory": { "servers": [ diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 39098822..6c83acaf 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -13,19 +13,9 @@ "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "features": { - "feature_rich_quoting": "labs", "feature_pinning": "labs", - "feature_presence_management": "labs", - "feature_sticker_messages": "labs", - "feature_jitsi": "labs", - "feature_tag_panel": "enable", - "feature_keybackup": "labs", "feature_custom_status": "labs", "feature_custom_tags": "labs", - "feature_lazyloading": "enable", - "feature_tabbed_settings": "labs", - "feature_sas": "labs", - "feature_room_breadcrumbs": "labs", "feature_state_counters": "labs", "feature_many_integration_managers": "labs", "feature_user_info_panel": "labs" From f61aae7e3fdaa13fb56f30f4a43a44905c62f354 Mon Sep 17 00:00:00 2001 From: shuji narazaki Date: Thu, 7 Nov 2019 23:26:29 +0000 Subject: [PATCH 36/70] Translated using Weblate (Japanese) Currently translated at 100.0% (23 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/ --- src/i18n/strings/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 4e5d007f..6176de21 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -37,7 +37,7 @@ "Dev chat for the Dendrite dev team": "Dendrite開発者チームのための開発者チャット", "Co-ordination for Riot translators": "Riot 翻訳者による共同作業", "Unexpected error preparing the app. See console for details.": "アプリケーションの準備中に予期しないエラーが発生しました。詳細はコンソールを参照してください。", - "Your Riot is misconfigured": "あなたの Riot は間違って設定されています。", + "Your Riot is misconfigured": "あなたのRiotは設定が間違っています", "Invalid configuration: no default server specified.": "不正な設定です：デフォルトのサーバーが設定されていません。", "Sign In": "サインイン", "Create Account": "アカウントを作成する", From 037d8c071cbe759f59e0b0ef7e43c106927f63c2 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 7 Nov 2019 13:31:52 +0000 Subject: [PATCH 37/70] Document feature flag process This records the feature flag process we intend to use with Riot and also how that interacts with other teams and configuration. Fixes https://github.com/vector-im/riot-web/issues/11116 --- docs/config.md | 7 ++-- docs/feature-flags.md | 89 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 docs/feature-flags.md diff --git a/docs/config.md b/docs/config.md index e609f26d..d85deabb 100644 --- a/docs/config.md +++ b/docs/config.md @@ -22,9 +22,10 @@ For a good example, see https://riot.im/develop/config.json. `default_hs_url` is specified. When multiple sources are specified, it is unclear which should take priority and therefore the application cannot continue. * As of Riot 1.4.0, identity servers are optional. See [Identity servers](#identity-servers) below. -1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user - in the `labs` section of settings. The available optional experimental features vary from - release to release. The available features are described in [labs.md](labs.md). +1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or + exposed to the user in the `labs` section of settings. The available + optional experimental features vary from release to release and are (usually) [documented](labs.md). The feature flag process is + [documented](feature-flags.md) as well. 1. `showLabsSettings`: Shows the "labs" tab of user settings even when no `features` are enabled or present. Useful for getting at settings which may be otherwise hidden. 1. `brand`: String to pass to your homeserver when configuring email notifications, to let the diff --git a/docs/feature-flags.md b/docs/feature-flags.md new file mode 100644 index 00000000..a4dbbea7 --- /dev/null +++ b/docs/feature-flags.md @@ -0,0 +1,89 @@ +# Feature flags + +When developing new features for Riot, we use feature flags to give us more +flexibility and control over when and where those features are enabled. + +For example, flags make the following things possible: + +* Extended testing of a feature via labs on develop +* Enabling features when ready instead of the first moment the code is released +* Testing a feature with a specific set of users (by enabling only on a specific + Riot instance) + +The size of the feature controlled by a feature flag may vary widely: it could +be a large project like reactions or a smaller change to an existing algorithm. +A large project might use several feature flags if it's useful to control the +deployment of different portions independently. + +Everyone involved in a feature (engineering, design, product, reviewers) should +think about its deployment plan up front as best as possible so we can have the +right feature flags in place from the start. + +## Interaction with spec process + +Historically, we have often used feature flags to guard client features that +depend on unstable spec features. Unfortunately, there was never clear agreement +about how long such a flag should live for, when it should be removed, etc. + +Under the [new spec +process](https://github.com/matrix-org/matrix-doc/pull/2324), server-side +unstable features can be used by clients and enabled by default as long as +clients commit to doing the associated clean up work once a feature stabilises. + +## Starting work on a feature + +When starting work on a feature, we should create a matching feature flag: + +* Add a new + [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) + of the form: +```js + "feature_cats": { + isFeature: true, + displayName: _td("Adds cats everywhere"), + supportedLevels: LEVELS_FEATURE, + default: false, + }, +``` +* Check whether the feature is enabled as appropriate: +```js + SettingsStore.isFeatureEnabled("feature_cats") +``` +* Add the feature to the [set of labs on develop](../riot.im/develop/config.json): +```json + "features": { + "feature_cats": "labs" + }, +``` +* Document the feature in the [labs documentation](labs.md) + +With these steps completed, the feature is disabled by default, but can be +enabled on develop by interested users for testing. + +Different features may have different deployment plans for when to enable where. The +following lists a few common options. + +## Enabling by default on develop + +Set the feature to `enable` in the [develop config](../riot.im/develop/config.json): + +```json + "features": { + "feature_cats": "enable" + }, +``` + +## Enabling by default on staging and app + +Set the feature to `enable` in the [app config](../riot.im/app/config.json). + +## Feature deployed successfully + +Once we're confident that a feature is working well, we should remove the flag: + +* Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) +* Remove all `isFeatureEnabled` lines that test for the feature's setting +* Remove the feature from the [labs documentation](labs.md) +* Remove feature state from [develop](../riot.im/develop/config.json) and + [app](../riot.im/app/config.json) configs +* Celebrate! 🥳 From 9ca438087e3c9c3e541e7e30af4525804989632d Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 8 Nov 2019 15:19:23 +0000 Subject: [PATCH 38/70] Add numbers --- docs/feature-flags.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/feature-flags.md b/docs/feature-flags.md index a4dbbea7..d49df3c8 100644 --- a/docs/feature-flags.md +++ b/docs/feature-flags.md @@ -34,9 +34,9 @@ clients commit to doing the associated clean up work once a feature stabilises. When starting work on a feature, we should create a matching feature flag: -* Add a new - [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) - of the form: +1. Add a new + [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) + of the form: ```js "feature_cats": { isFeature: true, @@ -45,17 +45,17 @@ When starting work on a feature, we should create a matching feature flag: default: false, }, ``` -* Check whether the feature is enabled as appropriate: +2. Check whether the feature is enabled as appropriate: ```js SettingsStore.isFeatureEnabled("feature_cats") ``` -* Add the feature to the [set of labs on develop](../riot.im/develop/config.json): +3. Add the feature to the [set of labs on develop](../riot.im/develop/config.json): ```json "features": { "feature_cats": "labs" }, ``` -* Document the feature in the [labs documentation](labs.md) +4. Document the feature in the [labs documentation](labs.md) With these steps completed, the feature is disabled by default, but can be enabled on develop by interested users for testing. @@ -81,9 +81,9 @@ Set the feature to `enable` in the [app config](../riot.im/app/config.json). Once we're confident that a feature is working well, we should remove the flag: -* Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) -* Remove all `isFeatureEnabled` lines that test for the feature's setting -* Remove the feature from the [labs documentation](labs.md) -* Remove feature state from [develop](../riot.im/develop/config.json) and +1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) +2. Remove all `isFeatureEnabled` lines that test for the feature's setting +3. Remove the feature from the [labs documentation](labs.md) +4. Remove feature state from [develop](../riot.im/develop/config.json) and [app](../riot.im/app/config.json) configs -* Celebrate! 🥳 +5. Celebrate! 🥳 From fa3d3aa4ddf2d106633e3f31175e3001d84701c5 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 8 Nov 2019 15:27:02 +0000 Subject: [PATCH 39/70] Absolute URLs --- docs/feature-flags.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/feature-flags.md b/docs/feature-flags.md index d49df3c8..26b93330 100644 --- a/docs/feature-flags.md +++ b/docs/feature-flags.md @@ -49,13 +49,13 @@ When starting work on a feature, we should create a matching feature flag: ```js SettingsStore.isFeatureEnabled("feature_cats") ``` -3. Add the feature to the [set of labs on develop](../riot.im/develop/config.json): +3. Add the feature to the [set of labs on develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json): ```json "features": { "feature_cats": "labs" }, ``` -4. Document the feature in the [labs documentation](labs.md) +4. Document the feature in the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) With these steps completed, the feature is disabled by default, but can be enabled on develop by interested users for testing. @@ -65,7 +65,7 @@ following lists a few common options. ## Enabling by default on develop -Set the feature to `enable` in the [develop config](../riot.im/develop/config.json): +Set the feature to `enable` in the [develop config](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json): ```json "features": { @@ -75,7 +75,7 @@ Set the feature to `enable` in the [develop config](../riot.im/develop/config.js ## Enabling by default on staging and app -Set the feature to `enable` in the [app config](../riot.im/app/config.json). +Set the feature to `enable` in the [app config](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json). ## Feature deployed successfully @@ -83,7 +83,9 @@ Once we're confident that a feature is working well, we should remove the flag: 1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) 2. Remove all `isFeatureEnabled` lines that test for the feature's setting -3. Remove the feature from the [labs documentation](labs.md) -4. Remove feature state from [develop](../riot.im/develop/config.json) and - [app](../riot.im/app/config.json) configs +3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) +4. Remove feature state from + [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json) + and [app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json) + configs 5. Celebrate! 🥳 From 8b0257d24b950d0daf6a14ab79fd5eb650cbcc3f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 8 Nov 2019 13:56:31 +0200 Subject: [PATCH 40/70] Apply suggestions from code review Co-Authored-By: Travis Ralston --- docs/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config.md b/docs/config.md index d85deabb..7fa7774e 100644 --- a/docs/config.md +++ b/docs/config.md @@ -24,7 +24,7 @@ For a good example, see https://riot.im/develop/config.json. * As of Riot 1.4.0, identity servers are optional. See [Identity servers](#identity-servers) below. 1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user in the `labs` section of settings. The available - optional experimental features vary from release to release and are (usually) [documented](labs.md). The feature flag process is + optional experimental features vary from release to release and are [documented](labs.md). The feature flag process is [documented](feature-flags.md) as well. 1. `showLabsSettings`: Shows the "labs" tab of user settings even when no `features` are enabled or present. Useful for getting at settings which may be otherwise hidden. From d373e2891ecbbbaddcad2e5b55666ad69bd2a3ad Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 8 Nov 2019 15:57:46 +0000 Subject: [PATCH 41/70] Describe regular setting path --- docs/feature-flags.md | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/docs/feature-flags.md b/docs/feature-flags.md index 26b93330..8d31afec 100644 --- a/docs/feature-flags.md +++ b/docs/feature-flags.md @@ -60,8 +60,8 @@ When starting work on a feature, we should create a matching feature flag: With these steps completed, the feature is disabled by default, but can be enabled on develop by interested users for testing. -Different features may have different deployment plans for when to enable where. The -following lists a few common options. +Different features may have different deployment plans for when to enable where. +The following lists a few common options. ## Enabling by default on develop @@ -75,7 +75,8 @@ Set the feature to `enable` in the [develop config](https://github.com/vector-im ## Enabling by default on staging and app -Set the feature to `enable` in the [app config](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json). +Set the feature to `enable` in the [app +config](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json). ## Feature deployed successfully @@ -89,3 +90,23 @@ Once we're confident that a feature is working well, we should remove the flag: and [app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json) configs 5. Celebrate! 🥳 + +## Convert to a regular setting (optional) + +Sometimes we decide a feature should always be user-controllable as a setting +even after it has been fully deployed. In that case, we would craft a new, +regular setting: + +1. Remove the feature flag from + [settings](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) + and add a regular setting with the appropriate levels for your feature +2. Replace the `isFeatureEnabled` lines with `getValue` or similar calls + according to the [settings + docs](https://github.com/matrix-org/matrix-react-sdk/blob/develop/docs/settings.md) + (checking carefully, as we may want a different mix of code paths when the + feature is always present but gated by a setting) +3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) +4. Remove feature state from + [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json) + and [app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json) + configs From 8f13e8b2bb3db87f36e9acb02451c344ed5a9390 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 8 Nov 2019 14:51:07 -0700 Subject: [PATCH 42/70] Add feature_dm_verification to labs --- riot.im/develop/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 6c83acaf..2604c477 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -18,7 +18,8 @@ "feature_custom_tags": "labs", "feature_state_counters": "labs", "feature_many_integration_managers": "labs", - "feature_user_info_panel": "labs" + "feature_user_info_panel": "labs", + "feature_dm_verification": "labs" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": { From 4eb0f014b8a98525d4bf2cc24e7f29dcc6f3af50 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 8 Nov 2019 14:54:24 -0700 Subject: [PATCH 43/70] Add DM verification feature to labs.md --- docs/labs.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/labs.md b/docs/labs.md index ae2c72a4..e4a29f3b 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -49,3 +49,7 @@ That's it. Now should see your new counter under the header. ## Multiple integration managers (`feature_many_integration_managers`) Exposes a way to access all the integration managers known to Riot. This is an implementation of [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957). + +## Verifications in DMs (`feature_dm_verification`) + +An implementation of [MSC2241](https://github.com/matrix-org/matrix-doc/pull/2241). When enabled, verification might not work with devices which don't support MSC2241. From b8af903703911a467bfe39a2b5837371e64fa3ce Mon Sep 17 00:00:00 2001 From: Elwyn Malethan Date: Sat, 9 Nov 2019 18:44:03 +0000 Subject: [PATCH 44/70] Translated using Weblate (Welsh) Currently translated at 100.0% (23 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cy/ --- src/i18n/strings/cy.json | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/cy.json b/src/i18n/strings/cy.json index 0967ef42..8f031b3e 100644 --- a/src/i18n/strings/cy.json +++ b/src/i18n/strings/cy.json @@ -1 +1,25 @@ -{} +{ + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Mae eich gosodiadau Riot yn cynnwys JSON annilys. Cywirwch y broblem ac ail-lwythwch y dudalen.", + "The message from the parser is: %(message)s": "Y neges gan y dosrannudd yn: %(message)s", + "Invalid JSON": "JSON annilys", + "Your Riot is misconfigured": "Mae eich Riot wedi'i gamosod", + "Unexpected error preparing the app. See console for details.": "Gwall annisgwyl wrth baratoi'r app. Gweler y consol am fanylion.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Gosodiad annilys: dim ond un o default_server_config, default_server_name, neu default_hs_url y gall ei nodi.", + "Invalid configuration: no default server specified.": "Gosodiad annilys: ni nodwyd gweinydd diofyn.", + "Riot Desktop on %(platformName)s": "Riot Cyfrifiadur ar %(platformName)s", + "Unknown device": "Dyfais anhysbys", + "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s trwy %(browserName)s ar %(osName)s", + "You need to be using HTTPS to place a screen-sharing call.": "Mae angen i chi fod yn defnyddio HTTPS i osod galwad rhannu sgrin.", + "powered by Matrix": "pwerwyd gan Matrix", + "Custom Server Options": "Opsiynau Gweinydd Addasadwy", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Gallwch ddefnyddio'r opsiynau gweinydd addasadwy i mewngofnodi i mewn i weinyddion Matrix eraill trwy rhoi URL hafanweinydd gwahanol. Mae hyn yn caniatáu ichi ddefnyddio Riot gyda chyfrif Matrix sy'n bodoli eisoes ar hafanweinydd gwahanol.", + "Dismiss": "Wfftio", + "Welcome to Riot.im": "Croeso i Riot.im", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Sgwrsio a chydweithredu datganoledig a amgryptiedig â phwerwyd gan [matrix]", + "Sign In": "Mewngofnodi", + "Create Account": "Creu Cyfrif", + "Need help?": "Angen cymorth?", + "Chat with Riot Bot": "Sgwrsio gyda Riot Bot", + "Explore rooms": "Archwilio Ystafelloedd", + "Room Directory": "Cyfeiriadur Ystafelloedd" +} From 52a3f4e1a822b9b8e4391b3e78f588e3aa39723e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= Date: Sun, 10 Nov 2019 23:54:57 +0000 Subject: [PATCH 45/70] Translated using Weblate (Czech) Currently translated at 100.0% (23 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/ --- src/i18n/strings/cs.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index a2ab2af4..5a870287 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -41,6 +41,13 @@ "Sign In": "Přihlásit se", "Create Account": "Vytvořit účet", "Need help?": "Chcete pomoct?", - "Explore rooms": "Objevit místnosti", - "Room Directory": "Adresář místností" + "Explore rooms": "Prohlížet místnosti", + "Room Directory": "Adresář místností", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfigurace Riotu obsahuje neplatný JSON. Opravte prosím tento problém a obnovte stránku.", + "The message from the parser is: %(message)s": "Zpráva z parseru je: %(message)s", + "Invalid JSON": "Neplatný JSON", + "Your Riot is misconfigured": "Riot je špatně nakonfigurován", + "Unexpected error preparing the app. See console for details.": "Neočekávaná chyba při přípravě aplikace. V konzoli je více informací.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neplatná konfigurace: je možné specifikovat pouze jednu volbu z default_server_config, default_server_name, nebo default_hs_url.", + "Invalid configuration: no default server specified.": "Neplatná konfigurace: není zadán výchozí server." } From d3778ab1fdb66095dfc85c2ab6079ada60cdf9a8 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 11 Nov 2019 13:59:32 +0000 Subject: [PATCH 46/70] Add description of user info feature --- docs/labs.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/labs.md b/docs/labs.md index e4a29f3b..08c6e068 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -53,3 +53,7 @@ Exposes a way to access all the integration managers known to Riot. This is an i ## Verifications in DMs (`feature_dm_verification`) An implementation of [MSC2241](https://github.com/matrix-org/matrix-doc/pull/2241). When enabled, verification might not work with devices which don't support MSC2241. + +## New user info panel (`feature_user_info_panel`) + +A new implementation of the user & member info panel, designed to share more code between showing community members & room members. From c6f62632d81ba29a4814b1cdf2512763e617d07a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 12 Nov 2019 10:12:25 -0700 Subject: [PATCH 47/70] Fix config.json syntax --- riot.im/develop/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 78849e7e..02e9213f 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -18,7 +18,7 @@ "feature_custom_tags": "labs", "feature_state_counters": "labs", "feature_many_integration_managers": "labs", - "feature_mjolnir": "labs" + "feature_mjolnir": "labs", "feature_user_info_panel": "labs", "feature_dm_verification": "labs" }, From ec9a38c2fe8fcaed3537b420d173517ae86a74fb Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 12 Nov 2019 15:02:52 -0700 Subject: [PATCH 48/70] Perform favicon updates twice in Chrome See diff for why this arcane magic is needed. Fixes https://github.com/vector-im/riot-web/issues/11347 --- src/vector/platform/VectorBasePlatform.js | 29 +++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js index f24031f7..e60da144 100644 --- a/src/vector/platform/VectorBasePlatform.js +++ b/src/vector/platform/VectorBasePlatform.js @@ -85,10 +85,31 @@ export default class VectorBasePlatform extends BasePlatform { bgColor = "#f00"; } - this.favicon.badge(notif, { - bgColor: bgColor, - }); - } catch (e) { + const doUpdate = () => { + this.favicon.badge(notif, { + bgColor: bgColor, + }); + }; + + doUpdate(); + + // HACK: Workaround for Chrome 78+ and dependency incompatibility. + // The library we use doesn't appear to work in Chrome 78, likely due to their + // changes surrounding tab behaviour. Tabs went through a bit of a redesign and + // restructuring in Chrome 78, so it's not terribly surprising that the library + // doesn't work correctly. The library we use hasn't been updated in years and + // does not look easy to fix/fork ourselves - we might as well write our own that + // doesn't include animation/webcam/etc support. However, that's a bit difficult + // so for now we'll just trigger the update twice. + // + // Note that trying to reproduce the problem in isolation doesn't seem to work: + // see https://gist.github.com/turt2live/5ab87919918adbfd7cfb8f1ad10f2409 for + // an example (you'll need your own web server to host that). + if (!!window.chrome) { + doUpdate(); + } + } + catch (e) { console.warn(`Failed to set badge count: ${e.message}`); } } From e84861f77027d20e035c49a444553538dd4738a0 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 12 Nov 2019 15:04:56 -0700 Subject: [PATCH 49/70] Apparently our eslint rules are different in different layers --- src/vector/platform/VectorBasePlatform.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js index e60da144..6b01e05e 100644 --- a/src/vector/platform/VectorBasePlatform.js +++ b/src/vector/platform/VectorBasePlatform.js @@ -105,7 +105,7 @@ export default class VectorBasePlatform extends BasePlatform { // Note that trying to reproduce the problem in isolation doesn't seem to work: // see https://gist.github.com/turt2live/5ab87919918adbfd7cfb8f1ad10f2409 for // an example (you'll need your own web server to host that). - if (!!window.chrome) { + if (window.chrome) { doUpdate(); } } From 71fb2e04a9923f68f3b158fabe7328f656a7ec41 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 12 Nov 2019 15:14:11 -0700 Subject: [PATCH 50/70] fix catch block indentation --- src/vector/platform/VectorBasePlatform.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js index 6b01e05e..32b43820 100644 --- a/src/vector/platform/VectorBasePlatform.js +++ b/src/vector/platform/VectorBasePlatform.js @@ -108,8 +108,7 @@ export default class VectorBasePlatform extends BasePlatform { if (window.chrome) { doUpdate(); } - } - catch (e) { + } catch (e) { console.warn(`Failed to set badge count: ${e.message}`); } } From d7c4ef2fe75af00a0c39d339a6de618fbda10335 Mon Sep 17 00:00:00 2001 From: take100yen Date: Tue, 12 Nov 2019 11:41:55 +0000 Subject: [PATCH 51/70] Translated using Weblate (Japanese) Currently translated at 100.0% (23 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/ --- src/i18n/strings/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 6176de21..265bb1b9 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -10,7 +10,7 @@ "powered by Matrix": "Matrix の支援により活動しています。", "Riot Desktop on %(platformName)s": "%(platformName)s向けデスクトップ版Riot", "You need to be using HTTPS to place a screen-sharing call.": "画面共有通話を行うにはHTTPS通信を使う必要があります。", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "[matrix]が支援する、分散型で暗号化された会話とコラボレーション", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "[matrix] による、分散型で暗号化された会話とコラボレーション", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "既にたくさんの部屋が、既存のネットワーク（Slack、IRC、Gitter等）に接続して、または独立的にMatrixに存在します。ディレクトリを検索してください！", "Chat with Riot Bot": "Riot Botと会話", "Get started with some tips from Riot Bot!": "Riot Botにヒントをもらって始めましょう！", From 6cf4fc102628b9109bb3ab6fef0d0a4aa2b8d754 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Nov 2019 14:00:22 -0700 Subject: [PATCH 52/70] Trigger a theme change on startup, not just a tint change Fixes https://github.com/vector-im/riot-web/issues/11370 --- src/vector/index.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/vector/index.js b/src/vector/index.js index afdad64f..507863b1 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -56,8 +56,8 @@ import WebPlatform from './platform/WebPlatform'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; import SettingsStore from "matrix-react-sdk/lib/settings/SettingsStore"; -import Tinter from 'matrix-react-sdk/lib/Tinter'; import SdkConfig from "matrix-react-sdk/lib/SdkConfig"; +import {getBaseTheme, setTheme} from "matrix-react-sdk/lib/theme"; import Olm from 'olm'; @@ -255,15 +255,18 @@ async function loadApp() { } // as quickly as we possibly can, set a default theme... + // we do this by checking to see if the theme's "base" has loaded first so we can + // safely rely on the assets. let a; const theme = SettingsStore.getValue("theme"); + const baseTheme = getBaseTheme(theme); for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) { const href = a.getAttribute("href"); if (!href) continue; // shouldn't we be using the 'title' tag rather than the href? const match = href.match(/^bundles\/.*\/theme-(.*)\.css$/); if (match) { - if (match[1] === theme) { + if (match[1] === baseTheme) { // remove the disabled flag off the stylesheet // Firefox requires setting the attribute to false, so do @@ -274,21 +277,21 @@ async function loadApp() { // in case the Tinter.tint() in MatrixChat fires before the // CSS has actually loaded (which in practice happens)... - // This if fixes Tinter.setTheme to not fire on Firefox + // This if fixes setTheme to not fire on Firefox // in case it is the first time loading Riot. // `InstallTrigger` is a Object which only exists on Firefox // (it is used for their Plugins) and can be used as a // feature check. // Firefox loads css always before js. This is why we dont use - // onload or it's EventListener as thoose will never trigger. + // onload or it's EventListener as those will never trigger. if (typeof InstallTrigger !== 'undefined') { - Tinter.setTheme(theme); + setTheme(theme); } else { // FIXME: we should probably block loading the app or even // showing a spinner until the theme is loaded, to avoid // flashes of unstyled content. a.onload = () => { - Tinter.setTheme(theme); + setTheme(theme); }; } } else { From eabd91c29c3a8dcc0e6d52345b8d59522ed508c6 Mon Sep 17 00:00:00 2001 From: Volodymyr Kostyrko Date: Thu, 14 Nov 2019 20:39:54 +0000 Subject: [PATCH 53/70] Translated using Weblate (Ukrainian) Currently translated at 100.0% (23 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/ --- src/i18n/strings/uk.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index 2485880a..816374ff 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -40,10 +40,14 @@ "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.": "Ви також можете встановити власний сервер ідентифікації, але Ви не зможете запрошувати користувачів (або бути запрошеним самому) за адресою електронної пошти.", "Need help?": "Допомогти?", "Sign In": "Вхід", - "Create Account": "Створити аккаунт", + "Create Account": "Створити акаунт", "Explore rooms": "Дослідити кімнати", "Room Directory": "Каталог кімнат", "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при підготовці програми. Дивіться деталі у виводі консолі.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невірна конфігурація: можна вказати лише default_server_config, default_server_name або default_hs_url.", - "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням." + "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням.", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Ваша конфігурація Riot містить некоректний JSON. Виправте проблему та оновіть сторінку.", + "The message from the parser is: %(message)s": "Повідомлення від парсера: %(message)s", + "Invalid JSON": "Хибний JSON", + "Your Riot is misconfigured": "Ваш Riot налаштовано неправильно" } From 8043aebe1af49ea64011698bec9003ea2ce0c4c2 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 15 Nov 2019 11:12:53 +0000 Subject: [PATCH 54/70] Add cross-signing labs flag to develop and document Part of https://github.com/vector-im/riot-web/issues/11407 --- docs/labs.md | 6 ++++++ riot.im/develop/config.json | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/labs.md b/docs/labs.md index 1a850fcc..882f1867 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -67,3 +67,9 @@ An implementation of [MSC2241](https://github.com/matrix-org/matrix-doc/pull/224 ## New user info panel (`feature_user_info_panel`) A new implementation of the user & member info panel, designed to share more code between showing community members & room members. + +## Cross-signing (`feature_cross_signing`) + +Cross-signing ([MSC1756](https://github.com/matrix-org/matrix-doc/pull/1756)) +improves the device verification experience by allowing you to verify a user +instead of verifying each of their devices. diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 02e9213f..05820c33 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -20,7 +20,8 @@ "feature_many_integration_managers": "labs", "feature_mjolnir": "labs", "feature_user_info_panel": "labs", - "feature_dm_verification": "labs" + "feature_dm_verification": "labs", + "feature_cross_signing": "labs" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": { From 6bf03415ace6820b3f8e0be9ef18d38a978803b1 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 18 Nov 2019 09:11:05 -0700 Subject: [PATCH 55/70] Let the user's homeserver config override the build config Specifically for the desktop app to prevent the warning about too many homeservers defined. --- electron_app/src/electron-main.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 7e65c534..b9289004 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -77,6 +77,18 @@ try { try { // Load local config and use it to override values from the one baked with the build const localConfig = require(path.join(app.getPath('userData'), 'config.json')); + + // If the local config has a homeserver defined, don't use the homeserver from the build + // config. This is to avoid a problem where Riot thinks there are multiple homeservers + // defined, and panics as a result. + const homeserverProps = ['default_is_url', 'default_hs_url', 'default_server_name', 'default_server_config']; + if (Object.keys(localConfig).find(k => homeserverProps.includes(k))) { + // Rip out all the homeserver options from the vector config + vectorConfig = Object.keys(vectorConfig) + .filter(k => !homeserverProps.includes(k)) + .reduce((obj, key) => {obj[key] = vectorConfig[key]; return obj;}, {}); + } + vectorConfig = Object.assign(vectorConfig, localConfig); } catch (e) { // Could not load local config, this is expected in most cases. From c197f7996b4bd37eb2109b7c242a6a96fbfd8d7f Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 19 Nov 2019 14:05:51 +0100 Subject: [PATCH 56/70] merge the feature_user_info_panel flag into feature_dm_verification --- docs/labs.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index 882f1867..70e12bce 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -52,8 +52,8 @@ Exposes a way to access all the integration managers known to Riot. This is an i ## New ways to ignore people (`feature_mjolnir`) -When enabled, a new settings tab appears for users to be able to manage their ban lists. -This is a different kind of ignoring where the ignored user's messages still get rendered, +When enabled, a new settings tab appears for users to be able to manage their ban lists. +This is a different kind of ignoring where the ignored user's messages still get rendered, but are hidden by default. Ban lists are rooms within Matrix, proposed as [MSC2313](https://github.com/matrix-org/matrix-doc/pull/2313). @@ -64,9 +64,7 @@ ban lists. An implementation of [MSC2241](https://github.com/matrix-org/matrix-doc/pull/2241). When enabled, verification might not work with devices which don't support MSC2241. -## New user info panel (`feature_user_info_panel`) - -A new implementation of the user & member info panel, designed to share more code between showing community members & room members. +This also includes a new implementation of the user & member info panel, designed to share more code between showing community members & room members. Built on top of this new panel is also a new UX for verification from the member panel. ## Cross-signing (`feature_cross_signing`) From 6fc742f2295972b34430f5d0db831946c1ffe1b0 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 19 Nov 2019 14:13:45 +0100 Subject: [PATCH 57/70] remove flag from develop config --- riot.im/develop/config.json | 1 - 1 file changed, 1 deletion(-) diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 05820c33..1d68c6ca 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -19,7 +19,6 @@ "feature_state_counters": "labs", "feature_many_integration_managers": "labs", "feature_mjolnir": "labs", - "feature_user_info_panel": "labs", "feature_dm_verification": "labs", "feature_cross_signing": "labs" }, From 64c23ae18d25b10ce29ee82680a78de579d80bd8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 19 Nov 2019 15:55:03 +0000 Subject: [PATCH 58/70] Fix error/exception in electron signing script 'Exception' isn't a thing: Error is --- scripts/electron_afterSign.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/electron_afterSign.js b/scripts/electron_afterSign.js index 8966ca7f..1f65438d 100644 --- a/scripts/electron_afterSign.js +++ b/scripts/electron_afterSign.js @@ -13,7 +13,7 @@ exports.default = async function(context) { // from the keychain, so we need to get it from the environment. const userId = process.env.NOTARIZE_APPLE_ID; if (userId === undefined) { - throw new Exception("User ID not found. Set NOTARIZE_APPLE_ID."); + throw new Error("User ID not found. Set NOTARIZE_APPLE_ID."); } console.log("Notarising macOS app. This may be some time."); From 312e1bab477b8cbd82cd8fdf8a34aafa595f88bb Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 19 Nov 2019 19:02:10 +0000 Subject: [PATCH 59/70] Add entitlements file for mic & camera permissions on macOS Fixes https://github.com/vector-im/riot-web/issues/11151 --- electron_app/build/entitlements.mac.plist | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 electron_app/build/entitlements.mac.plist diff --git a/electron_app/build/entitlements.mac.plist b/electron_app/build/entitlements.mac.plist new file mode 100644 index 00000000..cae02aea --- /dev/null +++ b/electron_app/build/entitlements.mac.plist @@ -0,0 +1,25 @@ + + + + + + com.apple.security.cs.allow-unsigned-executable-memory + + + com.apple.security.cs.disable-library-validation + + + + com.apple.security.device.camera + + com.apple.security.device.audio-input + + + From a34766bd05f14b07d0f27e77820529abe59053ec Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 19 Nov 2019 20:38:06 +0000 Subject: [PATCH 60/70] Fix tabs --- electron_app/build/entitlements.mac.plist | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/electron_app/build/entitlements.mac.plist b/electron_app/build/entitlements.mac.plist index cae02aea..9dd26e69 100644 --- a/electron_app/build/entitlements.mac.plist +++ b/electron_app/build/entitlements.mac.plist @@ -2,24 +2,24 @@ - - com.apple.security.cs.allow-unsigned-executable-memory - - - com.apple.security.cs.disable-library-validation - + + com.apple.security.cs.allow-unsigned-executable-memory + + + com.apple.security.cs.disable-library-validation + - - com.apple.security.device.camera - - com.apple.security.device.audio-input - + + com.apple.security.device.camera + + com.apple.security.device.audio-input + From a142a5a30c0db262d611d18652a387c94a9621f9 Mon Sep 17 00:00:00 2001 From: Alexis Date: Tue, 19 Nov 2019 05:29:02 +0000 Subject: [PATCH 61/70] Translated using Weblate (Portuguese) Currently translated at 87.0% (20 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/ --- src/i18n/strings/pt.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index f122a4d5..35d560fc 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -35,5 +35,18 @@ "Dev chat for the Dendrite dev team": "Conversa de desenvolvimento para a equipa do Dendrite", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Já existem muitas salas no Matrix, ligadas a redes já existentes (Slack, IRC, Gitter, etc) ou independentes. Dê uma vista de olhos no diretório!", "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.": "Você pode usar as opções de servidor personalizado para entrar em outros servidores Matrix, especificando um diferente URL de servidor doméstico.
Isto permite que você utilize Riot com uma conta Matrix existente em um servidor doméstico diferente.

Você também pode definir um servidor de identidade personalizado, porém não poderá convidar usuários por endereço de e-mail nem ser convidado por endereço de e-mail.", - "Co-ordination for Riot translators": "Coordenação para tradutores do Riot" + "Co-ordination for Riot translators": "Coordenação para tradutores do Riot", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "A sua configuração do RIOT contém JSON inválido. Por favor corriga o erro e recarregue a página.", + "The message from the parser is: %(message)s": "A mensagem do parser é:\n%(message)s", + "Invalid JSON": "JSON inválido.", + "Your Riot is misconfigured": "A sua configuração do RIOT está incorrecta.", + "Unexpected error preparing the app. See console for details.": "Erro inesperado, na preparação da aplicação. Veja consola, para mais detalhes.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: só pode especificar uma das default_server_config, default_server_name,\nor default_hs_url.", + "Invalid configuration: no default server specified.": "Configuração inválida: não existe especificação de servidor padrão.", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Pode usar as opções de custom server, para iniciar sessão noutros servidores Matrix.org, especificando o URL do homeserver diferente. Isto ira lhe atorizar a usar RIOT com a sua conta Matrix num servidor diferente", + "Sign In": "Iniciar sessão", + "Create Account": "Criar conta", + "Need help?": "Ajuda?", + "Explore rooms": "Explorar rooms", + "Room Directory": "Diretório de rooms" } From 0c9f0e52bdee02f3cec31a4eaf00d857391c56a6 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 20 Nov 2019 12:42:31 +0100 Subject: [PATCH 62/70] preload warning triangle --- src/vector/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vector/index.html b/src/vector/index.html index 864337ea..130e3425 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -43,6 +43,7 @@ +