From 15bded694bc32f6a229ffc49a9b56ea506ee5f56 Mon Sep 17 00:00:00 2001 From: XoseM Date: Fri, 20 Dec 2019 06:10:05 +0000 Subject: [PATCH 01/19] Translated using Weblate (Galician) 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/gl/ --- src/i18n/strings/gl.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index c2b0543da2..922610546e 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -14,5 +14,12 @@ "Create Account": "Crear conta", "Need help?": "¿Precisas axuda?", "Explore rooms": "Explorar salas", - "Room Directory": "Directorio de salas" + "Room Directory": "Directorio de salas", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuración de Riot contén JSON non válido. Corrixe o problema e recarga a páxina.", + "The message from the parser is: %(message)s": "A mensaxe desde o intérprete é: %(message)s", + "Invalid JSON": "JSON non válido", + "Your Riot is misconfigured": "Riot está mal configurado", + "Unexpected error preparing the app. See console for details.": "Fallo non agardado ao preparar a app. Detalles na consola.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración non válida: só se pode indicar un de default_server_config, default_server_name, ou default_hs_url.", + "Invalid configuration: no default server specified.": "Configuración non válida: non se indicou servidor por omisión." } From 262b5a56cac65acef82e247a5746aac40150eb8e Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 20 Dec 2019 21:04:39 +0000 Subject: [PATCH 02/19] Translated using Weblate (Turkish) Currently translated at 95.7% (22 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/ --- src/i18n/strings/tr.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 43b1462f7a..c83f95c25a 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -2,7 +2,7 @@ "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s işletim sisteminde %(browserName)s ile %(appName)s", "Custom Server Options": "Özelleştirilebilir Sunucu Seçenekleri", "Dismiss": "Kapat", - "powered by Matrix": "Matrix'den besleniyor", + "powered by Matrix": "Matrix tarafından destekleniyor", "Riot Desktop on %(platformName)s": "%(platformName)s platformunda Riot Masaüstü", "Unknown device": "Bilinmeyen aygıt", "You need to be using HTTPS to place a screen-sharing call.": "Ekran paylaşımlı arama yapmak için HTTPS kullanıyor olmalısınız.", @@ -14,5 +14,11 @@ "Create Account": "Kayıt Ol", "Need help?": "Yardıma mı ihtiyacın var?", "Explore rooms": "Odaları keşfet", - "Room Directory": "Oda Dizini" + "Room Directory": "Oda Dizini", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot yapılandırmanız geçersiz JSON ifadesi içermektedir. Lütfen problemi düzeltin ve sayfayı yenileyin.", + "Invalid JSON": "Geçersiz JSON", + "Your Riot is misconfigured": "Rioutunuz hatalı yapılandırılmış", + "Unexpected error preparing the app. See console for details.": "Uygulamayı hazırlarken beklenmeyen hata oluştu. Lütfen detaylar için konsola bakınız.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Geçersiz yapılandırma: default_server_config, default_server_name, yada default_hs_url den sadece birisi seçilebilir.", + "Invalid configuration: no default server specified.": "Geçersiz yapılandırma: varsayılan sunucu seçilmemiş." } From 3389f7afc991a5c15a79db73b2c294b927122d9a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 24 Dec 2019 18:34:40 -0700 Subject: [PATCH 03/19] Fix version file for Docker images Fixes https://github.com/vector-im/riot-web/issues/11642 --- scripts/docker-write-version.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/docker-write-version.sh b/scripts/docker-write-version.sh index 0ca2a477ee..730f47af7b 100644 --- a/scripts/docker-write-version.sh +++ b/scripts/docker-write-version.sh @@ -2,14 +2,16 @@ set -ex -TAG=$(git describe --dirty --tags) +TAG=$(git describe --tags) BRANCH=$(git rev-parse --abbrev-ref HEAD) DIST_VERSION=$TAG # If the branch comes out as HEAD then we're probably checked out to a tag, so if the thing is *not* # coming out as HEAD then we're on a branch. When we're on a branch, we want to resolve ourselves to # a few SHAs rather than a version. -if [ $BRANCH != 'HEAD' ] +# Docker Hub doesn't always check out the tag and sometimes checks out the branch, so we should look +# for an appropriately tagged branch as well (heads/v1.2.3). +if [ $BRANCH != 'HEAD' && $BRANCH != 'heads/v*' ] then REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD) JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD) From 1c0bb1101b91fa0c3fb89746795b44c23c6807aa Mon Sep 17 00:00:00 2001 From: "ferhad.necef" Date: Wed, 25 Dec 2019 17:38:07 +0000 Subject: [PATCH 04/19] Translated using Weblate (Azerbaijani) 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/az/ --- src/i18n/strings/az.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json index e9e16f50fb..a8604b2afe 100644 --- a/src/i18n/strings/az.json +++ b/src/i18n/strings/az.json @@ -2,7 +2,7 @@ "Riot Desktop on %(platformName)s": "%(platformName)s-da Riot Desktop", "Unknown device": "Naməlum qurğu", "You need to be using HTTPS to place a screen-sharing call.": "İş stolunun birgə istifadəsi üçün HTTPS-dan istifadə tələb olunur.", - "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot konfiqurasiyanızda yanlış JSON var. Lütfən, xətanı düzəldin və səhifəni yeniləyin", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot konfiqurasiyanızda yanlış JSON var. Lütfən, xətanı düzəldin və səhifəni yeniləyin.", "Invalid JSON": "Yanlış JSON", "Sign In": "Daxil ol", "Create Account": "Hesab Aç", @@ -13,5 +13,11 @@ "Unexpected error preparing the app. See console for details.": "Proqramı başladarkən gözlənilməz xəta. Ətraflı məlumat üçün konsola baxın.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Yanlış konfiqurasiya: default_server_config, default_server_name, və ya default_hs_url-dən yalnız birini təyin etməlisiniz.", "Invalid configuration: no default server specified.": "Yanlış konfiqurasiya: ilkin server təyin edilməyib.", - "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s-da %(browserName)s ilə %(appName)s" + "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s-da %(browserName)s ilə %(appName)s", + "The message from the parser is: %(message)s": "Sözügedən mesaj: %(message)s", + "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir", + "Custom Server Options": "Xüsusi Server Seçimləri", + "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.": "Fərqli bir URL-sini göstərərək digər Matrix serverlərinə daxil olmaq üçün xüsusi server seçimlərindən istifadə edə bilərsiniz. Bu, fərqli bir ev serverda mövcud Matrix hesabı ilə Riot istifadə etməyə imkan verir.", + "Dismiss": "Rədd et", + "Room Directory": "Otaq kataloqu" } From af76adf866c745d2f2e2ea5dd7efd2966930d46e Mon Sep 17 00:00:00 2001 From: Valeh Farzaliyev Date: Wed, 25 Dec 2019 17:42:05 +0000 Subject: [PATCH 05/19] Translated using Weblate (Azerbaijani) 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/az/ --- src/i18n/strings/az.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json index a8604b2afe..83b7edd332 100644 --- a/src/i18n/strings/az.json +++ b/src/i18n/strings/az.json @@ -10,7 +10,7 @@ "Chat with Riot Bot": "Riot Bot-la söhbət edin", "Explore rooms": "Otaqları kəşf edin", "Your Riot is misconfigured": "Riot yanlış quraşdırılıb", - "Unexpected error preparing the app. See console for details.": "Proqramı başladarkən gözlənilməz xəta. Ətraflı məlumat üçün konsola baxın.", + "Unexpected error preparing the app. See console for details.": "Proqramın başlanmasında gözlənilməz xəta. İzah üçün konsola baxın", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Yanlış konfiqurasiya: default_server_config, default_server_name, və ya default_hs_url-dən yalnız birini təyin etməlisiniz.", "Invalid configuration: no default server specified.": "Yanlış konfiqurasiya: ilkin server təyin edilməyib.", "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s-da %(browserName)s ilə %(appName)s", @@ -19,5 +19,7 @@ "Custom Server Options": "Xüsusi Server Seçimləri", "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.": "Fərqli bir URL-sini göstərərək digər Matrix serverlərinə daxil olmaq üçün xüsusi server seçimlərindən istifadə edə bilərsiniz. Bu, fərqli bir ev serverda mövcud Matrix hesabı ilə Riot istifadə etməyə imkan verir.", "Dismiss": "Rədd et", - "Room Directory": "Otaq kataloqu" + "Room Directory": "Otaq kataloqu", + "Welcome to Riot.im": "Riot.im-ə xoş gəlmişsiniz", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "[matrix] tərəfindən təchiz edilmiş mərkəziləşdirilməmiş, şifrələnmiş çat və əməkdaşlıq platforması" } From f98ac9dda1366a42a2a8aa6efc287be807d3f68c Mon Sep 17 00:00:00 2001 From: Valeh Farzaliyev Date: Wed, 25 Dec 2019 22:27:38 +0000 Subject: [PATCH 06/19] Translated using Weblate (Azerbaijani) 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/az/ --- src/i18n/strings/az.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json index 83b7edd332..1932bc5d9a 100644 --- a/src/i18n/strings/az.json +++ b/src/i18n/strings/az.json @@ -11,7 +11,7 @@ "Explore rooms": "Otaqları kəşf edin", "Your Riot is misconfigured": "Riot yanlış quraşdırılıb", "Unexpected error preparing the app. See console for details.": "Proqramın başlanmasında gözlənilməz xəta. İzah üçün konsola baxın", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Yanlış konfiqurasiya: default_server_config, default_server_name, və ya default_hs_url-dən yalnız birini təyin etməlisiniz.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Yanlış konfiqurasiya: bunlardan yalnız birini təyin edin - default_server_config, default_server_name, və ya default_hs_url.", "Invalid configuration: no default server specified.": "Yanlış konfiqurasiya: ilkin server təyin edilməyib.", "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s-da %(browserName)s ilə %(appName)s", "The message from the parser is: %(message)s": "Sözügedən mesaj: %(message)s", From 7744dcc508784c214f6c99109ef17441621aec9a Mon Sep 17 00:00:00 2001 From: Valeh Farzaliyev Date: Wed, 25 Dec 2019 22:28:14 +0000 Subject: [PATCH 07/19] Translated using Weblate (Azerbaijani) 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/az/ --- src/i18n/strings/az.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json index 1932bc5d9a..2f1408c5b6 100644 --- a/src/i18n/strings/az.json +++ b/src/i18n/strings/az.json @@ -12,7 +12,7 @@ "Your Riot is misconfigured": "Riot yanlış quraşdırılıb", "Unexpected error preparing the app. See console for details.": "Proqramın başlanmasında gözlənilməz xəta. İzah üçün konsola baxın", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Yanlış konfiqurasiya: bunlardan yalnız birini təyin edin - default_server_config, default_server_name, və ya default_hs_url.", - "Invalid configuration: no default server specified.": "Yanlış konfiqurasiya: ilkin server təyin edilməyib.", + "Invalid configuration: no default server specified.": "Yanlış konfiqurasiya: ilkin server təyin edilməyib", "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s-da %(browserName)s ilə %(appName)s", "The message from the parser is: %(message)s": "Sözügedən mesaj: %(message)s", "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir", From e993eee97cc01a00c31af6cea322a1a75b9b5fc7 Mon Sep 17 00:00:00 2001 From: Valeh Farzaliyev Date: Wed, 25 Dec 2019 22:28:35 +0000 Subject: [PATCH 08/19] Translated using Weblate (Azerbaijani) 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/az/ --- src/i18n/strings/az.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json index 2f1408c5b6..e3450e5d22 100644 --- a/src/i18n/strings/az.json +++ b/src/i18n/strings/az.json @@ -16,7 +16,7 @@ "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s-da %(browserName)s ilə %(appName)s", "The message from the parser is: %(message)s": "Sözügedən mesaj: %(message)s", "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir", - "Custom Server Options": "Xüsusi Server Seçimləri", + "Custom Server Options": "Fərdi Server Seçimləri", "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.": "Fərqli bir URL-sini göstərərək digər Matrix serverlərinə daxil olmaq üçün xüsusi server seçimlərindən istifadə edə bilərsiniz. Bu, fərqli bir ev serverda mövcud Matrix hesabı ilə Riot istifadə etməyə imkan verir.", "Dismiss": "Rədd et", "Room Directory": "Otaq kataloqu", From 01f14a72112f123d0cb972f37249677f7a64464f Mon Sep 17 00:00:00 2001 From: Valeh Farzaliyev Date: Wed, 25 Dec 2019 22:29:27 +0000 Subject: [PATCH 09/19] Translated using Weblate (Azerbaijani) 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/az/ --- src/i18n/strings/az.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json index e3450e5d22..fedd365598 100644 --- a/src/i18n/strings/az.json +++ b/src/i18n/strings/az.json @@ -17,7 +17,7 @@ "The message from the parser is: %(message)s": "Sözügedən mesaj: %(message)s", "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir", "Custom Server Options": "Fərdi Server Seçimləri", - "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.": "Fərqli bir URL-sini göstərərək digər Matrix serverlərinə daxil olmaq üçün xüsusi server seçimlərindən istifadə edə bilərsiniz. Bu, fərqli bir ev serverda mövcud Matrix hesabı ilə Riot istifadə etməyə imkan verir.", + "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.": "Fərqli server URL-ni təyin etməklə digər Matrix serverlərinə daxil olmaq üçün fərdi server seçimlərini istifadə edə bilərsiniz. Bu sizə başqa serverdə qaldırılmış mövcud Matrix hesabınızla Riot-u işlətməyə imkan verir.", "Dismiss": "Rədd et", "Room Directory": "Otaq kataloqu", "Welcome to Riot.im": "Riot.im-ə xoş gəlmişsiniz", From e25fee6f99f16a32838d6f97dd0c73f409b2d032 Mon Sep 17 00:00:00 2001 From: Valeh Farzaliyev Date: Wed, 25 Dec 2019 22:29:50 +0000 Subject: [PATCH 10/19] Translated using Weblate (Azerbaijani) 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/az/ --- src/i18n/strings/az.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json index fedd365598..9773436fa1 100644 --- a/src/i18n/strings/az.json +++ b/src/i18n/strings/az.json @@ -18,7 +18,7 @@ "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir", "Custom Server Options": "Fərdi Server Seçimləri", "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.": "Fərqli server URL-ni təyin etməklə digər Matrix serverlərinə daxil olmaq üçün fərdi server seçimlərini istifadə edə bilərsiniz. Bu sizə başqa serverdə qaldırılmış mövcud Matrix hesabınızla Riot-u işlətməyə imkan verir.", - "Dismiss": "Rədd et", + "Dismiss": "Nəzərə almayın", "Room Directory": "Otaq kataloqu", "Welcome to Riot.im": "Riot.im-ə xoş gəlmişsiniz", "Decentralised, encrypted chat & collaboration powered by [matrix]": "[matrix] tərəfindən təchiz edilmiş mərkəziləşdirilməmiş, şifrələnmiş çat və əməkdaşlıq platforması" From 7a285ead7e7a67f033d80df9b96c0070eb865320 Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 27 Dec 2019 19:51:24 +0000 Subject: [PATCH 11/19] Translated using Weblate (Turkish) 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/tr/ --- src/i18n/strings/tr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index c83f95c25a..71d1de1544 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -20,5 +20,6 @@ "Your Riot is misconfigured": "Rioutunuz hatalı yapılandırılmış", "Unexpected error preparing the app. See console for details.": "Uygulamayı hazırlarken beklenmeyen hata oluştu. Lütfen detaylar için konsola bakınız.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Geçersiz yapılandırma: default_server_config, default_server_name, yada default_hs_url den sadece birisi seçilebilir.", - "Invalid configuration: no default server specified.": "Geçersiz yapılandırma: varsayılan sunucu seçilmemiş." + "Invalid configuration: no default server specified.": "Geçersiz yapılandırma: varsayılan sunucu seçilmemiş.", + "The message from the parser is: %(message)s": "Ayrıştırıcıdan gelen mesaj: %(message)s" } From 16e384172c0b4381343a1e9178db3766da5d09ad Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 2 Jan 2020 17:44:58 -0700 Subject: [PATCH 12/19] Add docs for feature_ftue_dms flag This should hopefully be short-lived. For https://github.com/matrix-org/matrix-react-sdk/pull/3792 --- docs/labs.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/labs.md b/docs/labs.md index cb797b61ab..9de686b1e3 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -81,3 +81,10 @@ that downloads, stores, and indexes room messages for E2E encrypted rooms. The existing search will transparently work for encrypted rooms just like it does for non-encrypted. + +## New DM invite dialog (`feature_ftue_dms`) + +An improved dialog for inviting users. Once finished, this will replace both the +DM creation dialog and the 'invite user' dialog. This is a work in progress and +as such not all functionality may be present until the feature replaces today's +UX. From 514e9b754aaf1092a024efa8c1096657bfd47464 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 3 Jan 2020 10:25:09 -0700 Subject: [PATCH 13/19] Add FTUE User Lists to develop config --- 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 16ebbc3a17..7e7a4a63c4 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -21,7 +21,8 @@ "feature_mjolnir": "labs", "feature_dm_verification": "labs", "feature_cross_signing": "labs", - "feature_event_indexing": "labs" + "feature_event_indexing": "labs", + "feature_ftue_dms": "labs" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": { From d7607df1b162b5d9875bea895371c0ac862773d5 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Sun, 5 Jan 2020 15:42:09 +0000 Subject: [PATCH 14/19] Add feature_bridge_state to config --- 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 7e7a4a63c4..f3d5c1da59 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -22,7 +22,8 @@ "feature_dm_verification": "labs", "feature_cross_signing": "labs", "feature_event_indexing": "labs", - "feature_ftue_dms": "labs" + "feature_ftue_dms": "labs", + "feature_bridge_state": "labs" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": { From 50fe3109c08faf2efb7355368fe0a0df4de533f6 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Sun, 5 Jan 2020 15:47:14 +0000 Subject: [PATCH 15/19] Add feature_bridge_state --- docs/labs.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/labs.md b/docs/labs.md index 9de686b1e3..bce88b0e3b 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -88,3 +88,10 @@ An improved dialog for inviting users. Once finished, this will replace both the DM creation dialog and the 'invite user' dialog. This is a work in progress and as such not all functionality may be present until the feature replaces today's UX. + +## Bridge info tab (`feature_bridge_state`) + +Adds a "Bridge Info" tab to the Room Settings dialog, if a compatible bridge is +present in the room. The Bridge info tab pulls information from the `m.bridge` state event ([MSC2346](https://github.com/matrix-org/matrix-doc/pull/2346)). Since the feature is based upon a MSC, most +bridges are not expected to be compatible, and users should not rely on this +tab as the single source of truth just yet. From 8b3df0d793f3d8837ff6cc87d2da16fc4de5c5a9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 6 Jan 2020 13:09:10 +0000 Subject: [PATCH 16/19] Bump electron version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 24b86c1980..3f9e80ee34 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "7.1.3", + "electronVersion": "7.1.7", "files": [ "node_modules/**", "src/**" From 52ca0908e217c245ab7c7a915af2046e4bd09dec Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 6 Jan 2020 14:55:38 +0000 Subject: [PATCH 17/19] Fix the build Run `yarn install` in the js-sdkc and react-sdk installs. We were avoiding this before due to using babel dependencies from riot-web ro build js-sdk, which worked as long as the installed babel versions and plugins were identical. js-sdk has now been upgraded to babel 7 and so that no longer worked. This will probably cause react-sdk & js-sdk to be built an unnecessary number of times. --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 3f9e80ee34..ca634be937 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "i18n": "matrix-gen-i18n", "prunei18n": "matrix-prune-i18n", "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", + "postinstall": "node scripts/yarn-sub.js matrix-js-sdk install && node scripts/yarn-sub.js matrix-react-sdk install", "build:res": "node scripts/copy-res.js", "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js", "build:compile": "yarn reskindex && babel --source-maps -d lib src", From a6015d46f43a78e277ac05140ca9f1b27367e111 Mon Sep 17 00:00:00 2001 From: besendorf Date: Thu, 9 Jan 2020 15:48:12 +0100 Subject: [PATCH 18/19] Updates URL for Electron Command Line Switches old URL is not accessible anymore --- 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 453f2fe5e4..6e477f9015 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -63,7 +63,7 @@ if (argv["help"]) { console.log(" --hidden: Start the application hidden in the system tray."); console.log(" --help: Displays this help message."); console.log("And more such as --proxy, see:" + - "https://github.com/electron/electron/blob/master/docs/api/chrome-command-line-switches.md"); + "https://electronjs.org/docs/api/chrome-command-line-switches#supported-chrome-command-line-switches"); app.exit(); } From d877187d5e5667e7f24d18abefb6e61ca4500179 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 8 Jan 2020 19:19:54 -0700 Subject: [PATCH 19/19] Remove postinstall script now that it's not needed --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index ddbca6140f..bbcbceced1 100644 --- a/package.json +++ b/package.json @@ -32,14 +32,10 @@ "i18n": "matrix-gen-i18n", "prunei18n": "matrix-prune-i18n", "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", -<<<<<<< HEAD "reskindex": "reskindex -h src/header", "reskindex:watch": "reskindex -h src/header -w", "clean": "rimraf lib webapp electron_app/dist", "build": "yarn clean && yarn build:res && yarn build:compile && yarn build:types && yarn build:bundle", -======= - "postinstall": "node scripts/yarn-sub.js matrix-js-sdk install && node scripts/yarn-sub.js matrix-react-sdk install", ->>>>>>> develop "build:res": "node scripts/copy-res.js", "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js", "build:compile": "yarn reskindex && babel -d lib --verbose --extensions \".ts,.js\" src",