From ae4eb4c3da22d66dfc629c331c66f8fb60b8174f Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 1 Feb 2023 16:51:20 +0100 Subject: [PATCH 01/21] New test release v1.11.22-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 8f68fc6..a8168fb 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 8f68fc6612d1ca13fe97df744ad2538da1f9ade7 +Subproject commit a8168fb79b04960843f66d4b1975229b693ce9e3 diff --git a/element-web b/element-web index 62767ba..1424333 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 62767baf0e17758cce1422614028869d90ba68a4 +Subproject commit 14243333d9796685680117cd7f9e569af07941a7 diff --git a/matrix-js-sdk b/matrix-js-sdk index d89e210..7158a99 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit d89e210512f102196c66045c69ee69d767468b4b +Subproject commit 7158a99a1caf5cf9d780b19f1829a1257c8a5df3 diff --git a/matrix-react-sdk b/matrix-react-sdk index dd020a8..a29fbec 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit dd020a8866e8ee321f4ec403f410dc6ada265171 +Subproject commit a29fbec8465ed803e44c386395bf81945b417175 From 87e7893d0769d3c7fdc25920ef5a7378879c5de6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 1 Feb 2023 20:32:07 +0100 Subject: [PATCH 02/21] New release v1.11.22-sc.1 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index a8168fb..5716dd1 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit a8168fb79b04960843f66d4b1975229b693ce9e3 +Subproject commit 5716dd17a2dbe5428bb3223ba6e3a8a2dd9e4973 diff --git a/element-web b/element-web index 1424333..bfbdf4f 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 14243333d9796685680117cd7f9e569af07941a7 +Subproject commit bfbdf4f837ded883484eca1cfaedca2dd4b25b8a From b0177a42763e9724273973f71332c79e47b6d5f7 Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Fri, 3 Feb 2023 06:39:37 +0000 Subject: [PATCH 03/21] Translated using Weblate (Czech) Currently translated at 100.0% (51 of 51 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/cs/ --- i18n-overlays/matrix-react-sdk/cs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index 861e944..c07e3a1 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -21,8 +21,8 @@ "MXID": "MXID", "In group chats": "Ve skupinových chatech", "In public rooms": "Ve veřejných místnostech", - "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v domovském zobrazení.", - "Show all rooms in Home": "Ukázat všechny místnosti v domovském zobrazení", + "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v Úvodu.", + "Show all rooms in Home": "Zobrazit všechny místnosti v Úvodu", "Show people in spaces": "Ukázat lidi v prostorech", "Show notification badges for People in Spaces": "Zobrazit odznaky oznámení pro Lidé v prostorech", "Return to the room previously opened in a space": "Návrat do dříve otevřené místnosti v prostoru", From 2066ef2623ae01f24383c9d8ed95943238205267 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 1 Mar 2023 00:21:34 +0100 Subject: [PATCH 04/21] New test release v1.11.23-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 5716dd1..b4a7f5e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 5716dd17a2dbe5428bb3223ba6e3a8a2dd9e4973 +Subproject commit b4a7f5eb21fcc5e4efc8616f819f382b8fd72195 diff --git a/element-web b/element-web index bfbdf4f..8aee83a 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit bfbdf4f837ded883484eca1cfaedca2dd4b25b8a +Subproject commit 8aee83a35cba668b65a02460cd10a5f614c931d5 diff --git a/matrix-js-sdk b/matrix-js-sdk index 7158a99..f94634a 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 7158a99a1caf5cf9d780b19f1829a1257c8a5df3 +Subproject commit f94634a6dce0e08530c39bcc0c824d093dc93ba7 diff --git a/matrix-react-sdk b/matrix-react-sdk index a29fbec..4bf0df2 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit a29fbec8465ed803e44c386395bf81945b417175 +Subproject commit 4bf0df2b3dfadda74a33a566b1a99f9c2b98184a From 0ef609f57b5306956a756ff39e025df0ade5125f Mon Sep 17 00:00:00 2001 From: Felipe Nogueira Date: Thu, 2 Mar 2023 18:27:57 +0000 Subject: [PATCH 05/21] Translated using Weblate (Portuguese (Brazil)) Currently translated at 82.3% (42 of 51 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/pt_BR/ --- i18n-overlays/matrix-react-sdk/pt_BR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/pt_BR.json b/i18n-overlays/matrix-react-sdk/pt_BR.json index 5bac536..1b4c8af 100644 --- a/i18n-overlays/matrix-react-sdk/pt_BR.json +++ b/i18n-overlays/matrix-react-sdk/pt_BR.json @@ -40,5 +40,6 @@ "Room list style": "Estilo da lista de salas", "Mark rooms as unread": "Permitir markar conversas como não lidos", "Mark as unread": "Markar como não lido", - "Mark as read": "Markar como lido" + "Mark as read": "Markar como lido", + "Collapse additional buttons": "Recolher botões adicionais" } From d977e5c753f7762e081ddb1438771c5b41f2849e Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 15 Mar 2023 21:43:57 +0100 Subject: [PATCH 06/21] New test release v1.11.24-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index b4a7f5e..23da578 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit b4a7f5eb21fcc5e4efc8616f819f382b8fd72195 +Subproject commit 23da57819919e4c952c943d391261d1603036be4 diff --git a/element-web b/element-web index 8aee83a..1f0b06d 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 8aee83a35cba668b65a02460cd10a5f614c931d5 +Subproject commit 1f0b06df1402ca6b2559bccead05446b9df8a5eb diff --git a/matrix-js-sdk b/matrix-js-sdk index f94634a..0c0854b 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit f94634a6dce0e08530c39bcc0c824d093dc93ba7 +Subproject commit 0c0854b86419876835d1c6930a3b0c4d9861d3e5 diff --git a/matrix-react-sdk b/matrix-react-sdk index 4bf0df2..7a814df 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 4bf0df2b3dfadda74a33a566b1a99f9c2b98184a +Subproject commit 7a814df97f2afafbb1c0181e6b2996113bfbc971 From 2e3d370c38d1c4f8b8ece97701324c8db4be1e79 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 16 Mar 2023 00:10:51 +0100 Subject: [PATCH 07/21] New test release v1.11.25-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 23da578..b1a985e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 23da57819919e4c952c943d391261d1603036be4 +Subproject commit b1a985e12802af8e3d2bf5440477f32bf9513b72 diff --git a/element-web b/element-web index 1f0b06d..8f5c3d2 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1f0b06df1402ca6b2559bccead05446b9df8a5eb +Subproject commit 8f5c3d28afdab73e2a67e4f570ab9fa8988709ac diff --git a/matrix-js-sdk b/matrix-js-sdk index 0c0854b..589938f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 0c0854b86419876835d1c6930a3b0c4d9861d3e5 +Subproject commit 589938f71d50c55a78f7c3d5a7e54110e35279e0 diff --git a/matrix-react-sdk b/matrix-react-sdk index 7a814df..1cea13f 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 7a814df97f2afafbb1c0181e6b2996113bfbc971 +Subproject commit 1cea13f3c55f353fd3bac1110214de54ba3d6ade From 788816299c5ed68c0d451e6eac29e2917867d401 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 28 Mar 2023 20:59:25 +0200 Subject: [PATCH 08/21] New release v1.11.26-sc.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index b1a985e..1c4c88b 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit b1a985e12802af8e3d2bf5440477f32bf9513b72 +Subproject commit 1c4c88b45928b4a56cd770ba677f2fc4e2bf6b01 diff --git a/element-web b/element-web index 8f5c3d2..5bcb0a1 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 8f5c3d28afdab73e2a67e4f570ab9fa8988709ac +Subproject commit 5bcb0a17dda5f74f7edd5c1064fb12484527d7d8 diff --git a/matrix-js-sdk b/matrix-js-sdk index 589938f..738c29c 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 589938f71d50c55a78f7c3d5a7e54110e35279e0 +Subproject commit 738c29c7c32187d2d9cdda0aca998b6946acb746 diff --git a/matrix-react-sdk b/matrix-react-sdk index 1cea13f..916a4d6 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 1cea13f3c55f353fd3bac1110214de54ba3d6ade +Subproject commit 916a4d6275b92f716fd64af243eb7ebfc56d73e1 From b3516d16213dee33ac2cacfce02ed677396d2f20 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 2 Apr 2023 02:30:27 +0200 Subject: [PATCH 09/21] New test release v1.11.28-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/element-desktop b/element-desktop index 1c4c88b..55a5d81 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 1c4c88b45928b4a56cd770ba677f2fc4e2bf6b01 +Subproject commit 55a5d81ef815546fb2d2967896b77ab61410196e diff --git a/element-web b/element-web index 5bcb0a1..a46cb30 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 5bcb0a17dda5f74f7edd5c1064fb12484527d7d8 +Subproject commit a46cb302c74ebdb7bdc226f295b7e1ed264f199d diff --git a/matrix-react-sdk b/matrix-react-sdk index 916a4d6..becb561 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 916a4d6275b92f716fd64af243eb7ebfc56d73e1 +Subproject commit becb56166ec8cc5fbfb42440bbad42f5bb0f485a From c5042532eb1f774260e83ab9b745c1745a76f04b Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 7 Apr 2023 12:57:44 +0200 Subject: [PATCH 10/21] automatic_i18n_adjustment: It's still Element Call --- i18n-helper/index.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/i18n-helper/index.js b/i18n-helper/index.js index f226e47..11e3fc4 100644 --- a/i18n-helper/index.js +++ b/i18n-helper/index.js @@ -35,7 +35,13 @@ function writeStrings(p, strings) { let strings = readStrings(p); for (const key of Object.keys(strings)) { - strings[key] = strings[key].replace(/Element/g, "SchildiChat").replace(/element\.io/g, "schildi.chat"); + strings[key] = strings[key] + .replace(/Element/g, "SchildiChat") + .replace(/element\.io/g, "schildi.chat") + + // It's still Element Call + .replace(/SchildiChat Call/g, "Element Call") + .replace(/SchildiChat-Call/g, "Element-Call"); } if (overlayPath) { From 0ecdbb1bb821036b39fd28212177b433cb363778 Mon Sep 17 00:00:00 2001 From: Michele Agostinelli Date: Fri, 17 Mar 2023 08:42:42 +0000 Subject: [PATCH 11/21] Translated using Weblate (Italian) Currently translated at 62.7% (32 of 51 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/it/ --- i18n-overlays/matrix-react-sdk/it.json | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/it.json b/i18n-overlays/matrix-react-sdk/it.json index 72a5b3a..187e9c4 100644 --- a/i18n-overlays/matrix-react-sdk/it.json +++ b/i18n-overlays/matrix-react-sdk/it.json @@ -9,5 +9,26 @@ "Light theme": "Tema chiaro", "Dark theme": "Tema scuro", "Normal priority": "Priorità normale", - "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)" + "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)", + "Show message bubbles on one side only": "Visualizza bolle messaggi su un lato solo", + "Show message bubbles depending on the width either on both sides or only on one side": "Visualizza bolle messaggi in base alla lunghezza di entrambi i lati o di uno solo", + "User name color mode": "Modalità colore nome utente", + "Room list style": "Stile lista stanze", + "Theme": "Tema", + "Show all rooms in Home": "Visualizza tutte le stanze nella Home", + "All rooms you're in will appear in Home.": "Tutte le stanze in cui partecipi appariranno nella Home.", + "For people": "Per le persone", + "Room list": "Lista stanze", + "Show advanced theme settings": "Visualizza impostazioni avanzate tema", + "Mark rooms as unread": "Permetti di segnare le chat come non lette", + "Message bubbles": "Bolle messaggi", + "Message layout": "Impaginazione messaggi", + "Mark as unread": "Segna come non letto", + "Uniform": "Uniforme", + "Show people in spaces": "Visualizza persone negli spazi", + "MXID": "MXID", + "In public rooms": "Nelle stanze pubbliche", + "In group chats": "Nelle chat di gruppo", + "Font size and typeface": "Dimensione e tipo carattere", + "Hide advanced theme settings": "Nascondi impostazioni avanzate tema" } From 219c0e3cf737df40360815efd3712ce161f6d046 Mon Sep 17 00:00:00 2001 From: misibacsi Date: Thu, 20 Apr 2023 06:02:09 +0000 Subject: [PATCH 12/21] Translated using Weblate (Hungarian) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/schildichat-deskop/element-desktop Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/element-desktop/hu/ --- i18n-overlays/element-desktop/hu.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/element-desktop/hu.json b/i18n-overlays/element-desktop/hu.json index 0967ef4..8598663 100644 --- a/i18n-overlays/element-desktop/hu.json +++ b/i18n-overlays/element-desktop/hu.json @@ -1 +1,3 @@ -{} +{ + "Show": "Mutat" +} From 1e0e3b718c32eec5495be1486e13d68fb06d7591 Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 21 Apr 2023 12:32:00 +0200 Subject: [PATCH 13/21] New test release v1.11.29-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 55a5d81..46a18d2 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 55a5d81ef815546fb2d2967896b77ab61410196e +Subproject commit 46a18d2dfd420cc1f654fbb218ed97d64a22b8f4 diff --git a/element-web b/element-web index a46cb30..a21fcb8 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit a46cb302c74ebdb7bdc226f295b7e1ed264f199d +Subproject commit a21fcb8fbf4bf1026c0cbcc813af9ea618e62743 diff --git a/matrix-js-sdk b/matrix-js-sdk index 738c29c..af4413b 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 738c29c7c32187d2d9cdda0aca998b6946acb746 +Subproject commit af4413b7a681d5f590b7674d87b3a103086705d1 diff --git a/matrix-react-sdk b/matrix-react-sdk index becb561..1d04bb0 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit becb56166ec8cc5fbfb42440bbad42f5bb0f485a +Subproject commit 1d04bb0f28a0581a6ea93aa21cdac25843c9bb4d From 40c598e91b4cc21df066e49a0777015354a686a6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 21 Apr 2023 12:37:58 +0200 Subject: [PATCH 14/21] llvm15 seems to be necessary for Fedora 38 with rust --- Containerfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index 279d43f..501c662 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ FROM fedora:latest -RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat +RUN dnf install -y openssl openssl-devel rust cargo llvm15 libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat # node setup ARG NODE_VERSION From 10a511228584d6e14cb1c0257946fb93bdf8ae3e Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 21 Apr 2023 12:47:41 +0200 Subject: [PATCH 15/21] ruby fpm also needs its dependencies for Fedora --- Containerfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index 501c662..21b905f 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -11,7 +11,7 @@ RUN bash n ${NODE_VERSION} RUN npm install -g n RUN npm install -g yarn RUN npm install -g node-gyp -RUN gem install --ignore-dependencies --no-user-install --no-document fpm +RUN gem install --no-user-install --no-document fpm COPY . /project WORKDIR /project From 979be00158bd0c211553d5bdce17663e34ad6c13 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 22 Apr 2023 10:10:55 +0200 Subject: [PATCH 16/21] Add script to completely reset repos from leftovers --- hard_reset_repos.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 hard_reset_repos.sh diff --git a/hard_reset_repos.sh b/hard_reset_repos.sh new file mode 100755 index 0000000..4e17e2a --- /dev/null +++ b/hard_reset_repos.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" + +cd "$mydir" + +source ./merge_helpers.sh + +# Note: this doesn't delete files starting with a dot, +# and in particular not the '.git' directory, which we +# want to keep +forall_repos bash -c 'rm -rf *' +forall_repos git reset HEAD --hard From 0eb99a6a606c6917f6676c2d4abcecaf1848d0f4 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 22 Apr 2023 10:11:16 +0200 Subject: [PATCH 17/21] Make fixup: also check if yarn cache is broken and clean it if necessary If `yarn cache list` fails, this can also lead to weird errors during fixup, like ``` error /schildichat-desktop/matrix-react-sdk/node_modules/cypress: Command failed. Exit code: 1 Command: node index.js --exec install Arguments: Directory: /schildichat-desktop/matrix-react-sdk/node_modules/cypress Output: node:internal/modules/cjs/loader:433 throw err; ^ Error: Cannot find module '/schildichat-desktop/matrix-react-sdk/node_modules/human-signals/build/src/main.js'. Please verify that the package.json has a valid "main" entry at tryPackage (node:internal/modules/cjs/loader:425:19) at Function.Module._findPath (node:internal/modules/cjs/loader:638:18) at Function.Module._resolveFilename (node:internal/modules/cjs/loader:1012:27) at Function.Module._load (node:internal/modules/cjs/loader:871:27) at Module.require (node:internal/modules/cjs/loader:1098:19) at require (node:internal/modules/cjs/helpers:108:18) at Object. (/schildichat-desktop/matrix-react-sdk/node_modules/execa/lib/error.js:2:25) at Module._compile (node:internal/modules/cjs/loader:1196:14) at Object.Module._extensions..js (node:internal/modules/cjs/loader:1250:10) at Module.load (node:internal/modules/cjs/loader:1074:32) { code: 'MODULE_NOT_FOUND', path: '/schildichat-desktop/matrix-react-sdk/node_modules/human-signals ``` --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c517e5b..205cea9 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ .PHONY: container-build-debian container-build-fedora .PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release .PHONY: clean undo_setup fixup +.PHONY: fix_yarn_cache CFGDIR ?= configs/sc @@ -182,6 +183,9 @@ bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.loc ./build-bom.sh bom: bom.lock +fix_yarn_cache: + $(YARN) cache list || $(YARN) cache clean + clean: $(YARN) --cwd matrix-js-sdk clean $(YARN) --cwd matrix-react-sdk clean @@ -195,7 +199,7 @@ clean: undo_setup: rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak -fixup: undo_setup +fixup: undo_setup fix_yarn_cache make setup make clean make setup From 5122f0e870ed94d17f459c8cf0a13f1be501d147 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 22 Apr 2023 12:23:03 +0200 Subject: [PATCH 18/21] Add missing string for freeform reactions --- i18n-overlays/matrix-react-sdk/en_EN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 7732df7..2c59706 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -49,5 +49,6 @@ "Mixed": "Mixed", "Sound pack": "Sound pack", "Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety", - "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element" + "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element", + "React with \"%(reaction)s\"": "React with \"%(reaction)s\"" } From 64557e1da945d6c85db3d4f9bd95c7931bdfa2c8 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 22 Apr 2023 12:25:37 +0200 Subject: [PATCH 19/21] New test release v1.11.29-sc.0.test.2 --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/element-desktop b/element-desktop index 46a18d2..ba31f4b 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 46a18d2dfd420cc1f654fbb218ed97d64a22b8f4 +Subproject commit ba31f4b8c3194f352ba1ec9bbd1517950f0bf754 diff --git a/element-web b/element-web index a21fcb8..2e5ba06 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit a21fcb8fbf4bf1026c0cbcc813af9ea618e62743 +Subproject commit 2e5ba06a3b118347e0f6437328b8f91dbfb53999 diff --git a/matrix-react-sdk b/matrix-react-sdk index 1d04bb0..d53a6e0 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 1d04bb0f28a0581a6ea93aa21cdac25843c9bb4d +Subproject commit d53a6e02420cfb19794b1c1732a1da23765c7023 From 1a485faf72af8aa6316e6c7194b7ae18ebe0d051 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 22 Apr 2023 12:30:03 +0200 Subject: [PATCH 20/21] New test release v1.11.29-sc.0.test.3 --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/element-desktop b/element-desktop index ba31f4b..ca3c38e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit ba31f4b8c3194f352ba1ec9bbd1517950f0bf754 +Subproject commit ca3c38e98d79a852098df85612fb0c21989d88ca diff --git a/element-web b/element-web index 2e5ba06..d8643e4 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2e5ba06a3b118347e0f6437328b8f91dbfb53999 +Subproject commit d8643e4983b11a87831af1729037976d14641454 diff --git a/matrix-react-sdk b/matrix-react-sdk index d53a6e0..21ecba2 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d53a6e02420cfb19794b1c1732a1da23765c7023 +Subproject commit 21ecba234658a89d22eccb33429d3770b7a28341 From f9ab1ef2e02d3aaa58ff74cb1b71d4cf5d7509b4 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 25 Apr 2023 22:59:51 +0200 Subject: [PATCH 21/21] New release v1.11.30-sc.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index ca3c38e..a8b266d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit ca3c38e98d79a852098df85612fb0c21989d88ca +Subproject commit a8b266dd964b97282caaa4c43a90e9bf6a95f9a4 diff --git a/element-web b/element-web index d8643e4..2ca5291 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d8643e4983b11a87831af1729037976d14641454 +Subproject commit 2ca5291da7501ee50d3f24717cdfcb8d27aebfe5 diff --git a/matrix-js-sdk b/matrix-js-sdk index af4413b..c0ab637 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit af4413b7a681d5f590b7674d87b3a103086705d1 +Subproject commit c0ab63777e1d1bf2e6756359e66b1e3c0ff54a27 diff --git a/matrix-react-sdk b/matrix-react-sdk index 21ecba2..d8cf78a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 21ecba234658a89d22eccb33429d3770b7a28341 +Subproject commit d8cf78aa21f2aeb8ab444a4dd3d7e9f90fea59b2