From 0ba494e9559ab39a4dd0a936c3d33b9f09ac064b Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 25 Apr 2023 23:53:41 +0200 Subject: [PATCH 01/12] Use llvm instead llvm15 for Fedora --- Containerfile.fedora | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index 21b905f..a61578c 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ FROM fedora:latest -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 +RUN dnf install -y openssl openssl-devel rust cargo llvm libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat # node setup ARG NODE_VERSION @@ -17,4 +17,4 @@ COPY . /project WORKDIR /project # There might be remnants of the host which break the build -RUN make fixup \ No newline at end of file +RUN make fixup From a8be3ffcde6d55a6388450ca84bb9b281cb37a6a Mon Sep 17 00:00:00 2001 From: misibacsi Date: Sat, 22 Apr 2023 05:07:41 +0000 Subject: [PATCH 02/12] Translated using Weblate (Hungarian) Currently translated at 50.9% (26 of 51 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/hu/ --- i18n-overlays/matrix-react-sdk/hu.json | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/hu.json b/i18n-overlays/matrix-react-sdk/hu.json index a048d36..cde030f 100644 --- a/i18n-overlays/matrix-react-sdk/hu.json +++ b/i18n-overlays/matrix-react-sdk/hu.json @@ -3,5 +3,27 @@ "Show message bubbles on one side only": "Üzenetbuborékok megjelenítése csak az egyik oldalon", "Message bubbles": "Üzenet buborékok", "Show message bubbles depending on the width either on both sides or only on one side": "Üzenetbuborékok megjelenítése a szélességtől függően mindkét oldalon vagy csak az egyik oldalon", - "Normal priority": "Normál prioritás" + "Normal priority": "Normál prioritás", + "Show people and rooms in a combined list": "Személyek és szobák megjelenítése egy egyesített listában", + "Update notifications": "Értesítések frissítése", + "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).": "Szeretne csatlakozni olyan szobához, amely értesíti Önt az új megjelenésekről? Ez különösen akkor hasznos, ha az Ön platformja nem támogatja a SchildiChat automatikus frissítéseit (pl. Windows és macOS).", + "System": "Rendszer", + "Show all rooms in Home": "Az összes szoba megjelenítése a kezdőoldalon", + "All rooms you're in will appear in Home.": "Az összes szoba, amelyben tartózkodik, megjelenik a Kezdőlapon.", + "Mark as read": "Olvasottnak jelöl", + "Enable YouTube embed player": "YouTube beágyazott lejátszó engedélyezése", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "A Kezdőlap hasznos ahhoz, hogy mindenről áttekintést kapjunk. Ne feledje, hogy a kikapcsolásával bizonyos szobákat nem fog látni.", + "Schildi: Softer sounds for reduced anxiety": "Schildi: Lágyabb hangok a kevesebb stresszért", + "Sound pack": "Hangcsomag", + "Classic: The same sharp sounds as Element": "Klasszikus: Ugyanazok az éles hangok, mint az Elementnél", + "Don't ask again": "Ne kérdezze újra", + "Light theme": "Világos téma", + "Dark theme": "Sötét téma", + "Mark as unread": "Olvasatlannak jelöl", + "Collapse additional buttons": "További gombok összecsukása", + "Theme": "Téma", + "Room list": "Szobák listája", + "Font size and typeface": "Betűméret és betűtípus", + "Message layout": "Üzenetek elrendezése", + "Modern": "Modern" } From 9561c95bb6284bc579b6406e79853fcc9fc5e860 Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Mon, 24 Apr 2023 06:40:18 +0000 Subject: [PATCH 03/12] Translated using Weblate (Czech) Currently translated at 100.0% (52 of 52 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index c07e3a1..a0816fc 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -50,5 +50,6 @@ "Mixed": "Smíšené", "Sound pack": "Balíček zvuků", "Schildi: Softer sounds for reduced anxiety": "Schildi: Jemnější zvuky pro snížení úzkosti", - "Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element" + "Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element", + "React with \"%(reaction)s\"": "Reagovat pomocí \"%(reaction)s\"" } From 3ac88b91326983e1e833398400fbb096533a3c64 Mon Sep 17 00:00:00 2001 From: Linerly Date: Sun, 23 Apr 2023 16:40:27 +0000 Subject: [PATCH 04/12] Translated using Weblate (Indonesian) Currently translated at 100.0% (52 of 52 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/id/ --- i18n-overlays/matrix-react-sdk/id.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index c0d5cbb..3324b6f 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -49,5 +49,6 @@ "Mixed": "Campur", "Sound pack": "Paket suara", "Schildi: Softer sounds for reduced anxiety": "Schildi: Suara lebih lembut untuk mengurangi kecemasan", - "Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element" + "Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element", + "React with \"%(reaction)s\"": "Reaksi dengan \"%(reaction)s\"" } From e68cd727722d1a5ddf20b611b45167e545c8c032 Mon Sep 17 00:00:00 2001 From: Xenine Date: Sun, 14 May 2023 22:13:08 +0000 Subject: [PATCH 05/12] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (52 of 52 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/zh_Hans/ --- i18n-overlays/matrix-react-sdk/zh_Hans.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json index aef112a..e3e332a 100644 --- a/i18n-overlays/matrix-react-sdk/zh_Hans.json +++ b/i18n-overlays/matrix-react-sdk/zh_Hans.json @@ -42,5 +42,13 @@ "Mark as unread": "标记为未读", "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "主页对于概览所有消息来说非常有用。请注意：禁用主页可能会让您无法看到某些房间。", "Enable YouTube embed player": "启用 YouTube 嵌入式播放器", - "Collapse additional buttons": "折叠额外的按钮" + "Collapse additional buttons": "折叠额外的按钮", + "Round": "圆角", + "React with \"%(reaction)s\"": "与 \"%(reaction)s\" 互动", + "Schildi: Softer sounds for reduced anxiety": "Schildi: 舒缓音效以减少焦虑", + "Mixed": "混合", + "Extra round": "超圆角", + "Sound pack": "音频包", + "Classic: The same sharp sounds as Element": "Classic: 与 Element 相同的尖锐声音", + "Corners": "边缘" } From 143bf7af1e749b39189a2e84eea2d0d971bcdd74 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 31 Jul 2023 15:11:53 +0200 Subject: [PATCH 06/12] merge-upstream.sh: Allow merging specific version --- merge_upstream.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/merge_upstream.sh b/merge_upstream.sh index cfbea1f..e772262 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -23,7 +23,13 @@ automatic_i18n_reversion automatic_packagejson_reversion # Merge upstream -get_latest_upstream_tag + +# Check if specific version to merge passed +if [ -z "$1" ]; then + get_latest_upstream_tag +else + latest_upstream_tag="$1" +fi forelement_repos git merge "$latest_upstream_tag" get_current_mxsdk_tags From 8a1b9ab40fed4e7993dbfdaf1ef3ea7dfa0224d3 Mon Sep 17 00:00:00 2001 From: Sebastian Walz Date: Tue, 7 Nov 2023 19:27:21 +0100 Subject: [PATCH 07/12] Update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 271a3d0..d010aa2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1633901457, - "narHash": "sha256-GNJLwKENqEA4xlzkWI76VLHBAua4LUIlTeeiH4FR7Gc=", + "lastModified": 1699380656, + "narHash": "sha256-H9kQH3J2Z15Ady3zVQsN/tXv8qnRr+p1B0eUkR1bKfE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f358794824b4595d77fec93732485d329ed7b0e0", + "rev": "03e7a22654c44489a0a70ea0e237de3e512cd8a6", "type": "github" }, "original": { From 2c9f4caa8b7c667a3760cc7f06871ee1a55fc394 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 13 Dec 2023 02:27:35 +0100 Subject: [PATCH 08/12] New test release v1.11.33-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 2f54ef6..16d3620 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 2f54ef60617db8b5d4a8acdb3ae90721d05de3b3 +Subproject commit 16d3620517cd22e92b52807bc7eb6cc8b4414780 diff --git a/element-web b/element-web index f3e6edb..e5afedf 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f3e6edbe968d21abe48fc64cb2fe93fffd69c4fd +Subproject commit e5afedfac20168e491fc9a2b59cd1c8a07c3c35c diff --git a/matrix-js-sdk b/matrix-js-sdk index c0ab637..255144e 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit c0ab63777e1d1bf2e6756359e66b1e3c0ff54a27 +Subproject commit 255144ef2c9e141a171101e18091961f1be6db7f diff --git a/matrix-react-sdk b/matrix-react-sdk index 9e45813..9994f86 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 9e4581350e1b5b78263558ec992090f450e3ac96 +Subproject commit 9994f867123a10b78fae014c3fa1ef919d89487e From 8cf7414a857a47df0e2002105cb1e6e9a3173874 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 13 Dec 2023 02:28:15 +0100 Subject: [PATCH 09/12] New test release v1.11.33-sc.0.test.2 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 16d3620..c221f6c 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 16d3620517cd22e92b52807bc7eb6cc8b4414780 +Subproject commit c221f6cf768fbc133c744d4869744d8c12c75e64 diff --git a/element-web b/element-web index e5afedf..bfa6512 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit e5afedfac20168e491fc9a2b59cd1c8a07c3c35c +Subproject commit bfa65127b2f7a68cdb4086a68250bbdade6e3d06 From cb6f6d990154004fd20d6f215e13909d6c697342 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 22 Feb 2024 19:24:36 +0100 Subject: [PATCH 10/12] New test release v1.11.34-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 c221f6c..000e503 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit c221f6cf768fbc133c744d4869744d8c12c75e64 +Subproject commit 000e503779cba2f211aa487a0bb5625969b37a16 diff --git a/element-web b/element-web index bfa6512..396585e 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit bfa65127b2f7a68cdb4086a68250bbdade6e3d06 +Subproject commit 396585e92889f53aa3575c0dea921b668c4006e3 diff --git a/matrix-js-sdk b/matrix-js-sdk index 255144e..10fe11f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 255144ef2c9e141a171101e18091961f1be6db7f +Subproject commit 10fe11f7a9d803508f83cbab02899779de53f414 diff --git a/matrix-react-sdk b/matrix-react-sdk index 9994f86..6a3ee32 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 9994f867123a10b78fae014c3fa1ef919d89487e +Subproject commit 6a3ee32cf8df4ad4b84cab1f814eeb26ac0abd34 From 2597454e9626fc4fe91737466c511ec932c7c3e2 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 22 Feb 2024 19:56:41 +0100 Subject: [PATCH 11/12] New test release v1.11.35-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 000e503..f00d8f6 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 000e503779cba2f211aa487a0bb5625969b37a16 +Subproject commit f00d8f6b3f1ec326e3081a8f4d49abc399e4ef75 diff --git a/element-web b/element-web index 396585e..8a4b06c 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 396585e92889f53aa3575c0dea921b668c4006e3 +Subproject commit 8a4b06c6bcc134944f58b2ccc0c87b8b9ef29745 diff --git a/matrix-js-sdk b/matrix-js-sdk index 10fe11f..5d086fe 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 10fe11f7a9d803508f83cbab02899779de53f414 +Subproject commit 5d086fe0a39e15255dcc02cab80ed57ffb6b00a0 diff --git a/matrix-react-sdk b/matrix-react-sdk index 6a3ee32..3442618 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 6a3ee32cf8df4ad4b84cab1f814eeb26ac0abd34 +Subproject commit 344261869234925f01689eb575fe2bc7013c9547 From 5f41b4c654ca853db3a4c1b0b4c293a8d04940fd Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 19:21:05 +0100 Subject: [PATCH 12/12] New test release v1.11.36-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 f00d8f6..738de77 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit f00d8f6b3f1ec326e3081a8f4d49abc399e4ef75 +Subproject commit 738de7784bddb2285d2f015102e8e2e15877decb diff --git a/element-web b/element-web index 8a4b06c..ecf1586 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 8a4b06c6bcc134944f58b2ccc0c87b8b9ef29745 +Subproject commit ecf1586a0f83a9fbce1c95290f1520a64848d894 diff --git a/matrix-js-sdk b/matrix-js-sdk index 5d086fe..9bbc329 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 5d086fe0a39e15255dcc02cab80ed57ffb6b00a0 +Subproject commit 9bbc329635e1e31f5e72e93ef87ccd90b43de538 diff --git a/matrix-react-sdk b/matrix-react-sdk index 3442618..3638445 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 344261869234925f01689eb575fe2bc7013c9547 +Subproject commit 363844517bc5e55327c459a0d0f3a3280a975d10