From 0595d1d0994d5dcb6585c2149cb2f9deb8f429d5 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 18 Jun 2022 19:23:39 +0200 Subject: [PATCH 001/100] Add new border radius strings --- i18n-overlays/matrix-react-sdk/en_EN.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 8d07295..e45eaab 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -42,5 +42,9 @@ "Mark as read": "Mark as read", "Enable YouTube embed player": "Enable YouTube embed player", "Collapse additional buttons": "Collapse additional buttons", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms." + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.", + "Corners": "Corners", + "Round": "Round", + "Extra round": "Extra round", + "Mixed": "Mixed" } From 2a4d537607663bb31e0f559798bb52a497ca44fc Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 18 Jun 2022 17:26:23 +0000 Subject: [PATCH 002/100] Translated using Weblate (German) Currently translated at 100.0% (48 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/ --- i18n-overlays/matrix-react-sdk/de_DE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index 02c1ee5..3bb30e2 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -143,5 +143,10 @@ "Mark as read": "Als gelesen markieren", "Mark as unread": "Als ungelesen markieren", "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren", - "Collapse additional buttons": "Zusätzliche Buttons einklappen" + "Collapse additional buttons": "Zusätzliche Buttons einklappen", + "Round": "Rund", + "Mixed": "Gemischt", + "Corners": "Ecken", + "Extra round": "Extra rund", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst." } From 714ea6d9e49534ff817f8a8c421bdfaf4635d4c3 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 18 Jun 2022 19:41:42 +0200 Subject: [PATCH 003/100] New test release v1.10.15-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 1d3a14d..5fb3c3f 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 1d3a14db9c017d935085611c3259f386e19a366b +Subproject commit 5fb3c3f8f21de8d82c76c76b56a8dd024b5e213d diff --git a/element-web b/element-web index 11fedf6..3e1e6f8 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 11fedf60a5067b7139a90b70b0e672acd4e8f82a +Subproject commit 3e1e6f8413a452e77a41ddbb4bdd453fa8bd209f diff --git a/matrix-react-sdk b/matrix-react-sdk index f167688..5b96624 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit f1676885198c4544e73a103571c0d14dcfcadeef +Subproject commit 5b9662482613e3e74b49d7d8fa7684cda3dd839e From 6aaa75d991ecc68f004aa93cae30bfa81b009a18 Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Mon, 20 Jun 2022 06:27:28 +0000 Subject: [PATCH 004/100] Translated using Weblate (Czech) Currently translated at 100.0% (48 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/cs/ --- i18n-overlays/matrix-react-sdk/cs.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index f4e03bb..a8b9501 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -43,5 +43,9 @@ "Mark as read": "Označit jako přečtené", "Enable YouTube embed player": "Povolí vložený přehrávač YouTube", "Collapse additional buttons": "Sbalit další tlačítka", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti." + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti.", + "Corners": "Rohy", + "Round": "Oblé", + "Extra round": "Kulaté", + "Mixed": "Smíšené" } From 4650aa2ec15aaab224249afdceb7697d1d08e624 Mon Sep 17 00:00:00 2001 From: joshua Date: Sun, 19 Jun 2022 18:19:48 +0000 Subject: [PATCH 005/100] Translated using Weblate (Swedish) Currently translated at 100.0% (48 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sv/ --- i18n-overlays/matrix-react-sdk/sv.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 7282f7f..284a43a 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -42,5 +42,9 @@ "Mark rooms as unread": "Tillåt att chattar markeras som olästa", "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare", "Collapse additional buttons": "Dölj ytterligare knappar", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum." + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum.", + "Round": "Runda", + "Extra round": "Extrarunda", + "Mixed": "Blandad", + "Corners": "Hörn" } From cddd80ae2ad313699290a9fbac2e0f720510f69e Mon Sep 17 00:00:00 2001 From: Linerly Date: Sun, 19 Jun 2022 17:21:55 +0000 Subject: [PATCH 006/100] Translated using Weblate (Indonesian) Currently translated at 100.0% (48 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/id/ --- i18n-overlays/matrix-react-sdk/id.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index a986a4d..0b8d8a5 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -42,5 +42,9 @@ "Mark as read": "Tandai sebagai dibaca", "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat", "Collapse additional buttons": "Sembunyikan tombol tambahan", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan." + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan.", + "Corners": "Sudut", + "Round": "Bulat", + "Extra round": "Ekstra bulat", + "Mixed": "Campur" } From 89e4c0444e12a8b57ccbc1694285e8a9986f76f7 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 22 Jun 2022 09:02:54 +0200 Subject: [PATCH 007/100] Added translation using Weblate (Turkish) --- i18n-overlays/element-web/tr.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/element-web/tr.json diff --git a/i18n-overlays/element-web/tr.json b/i18n-overlays/element-web/tr.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-web/tr.json @@ -0,0 +1 @@ +{} From 8d2e87e3ff37c70c203ba7ee18455663cf9a213b Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 22 Jun 2022 09:02:56 +0200 Subject: [PATCH 008/100] Added translation using Weblate (Turkish) --- i18n-overlays/element-desktop/tr.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/element-desktop/tr.json diff --git a/i18n-overlays/element-desktop/tr.json b/i18n-overlays/element-desktop/tr.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-desktop/tr.json @@ -0,0 +1 @@ +{} From 4d6909368bb908b50efc9f200c73d90efc8a42b8 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 22 Jun 2022 09:02:59 +0200 Subject: [PATCH 009/100] Added translation using Weblate (Turkish) --- i18n-overlays/matrix-react-sdk/tr.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/matrix-react-sdk/tr.json diff --git a/i18n-overlays/matrix-react-sdk/tr.json b/i18n-overlays/matrix-react-sdk/tr.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/matrix-react-sdk/tr.json @@ -0,0 +1 @@ +{} From e0ee5eaaefdd3554833c433d4f9b756f4da8dd61 Mon Sep 17 00:00:00 2001 From: metezd Date: Thu, 23 Jun 2022 07:25:08 +0000 Subject: [PATCH 010/100] Translated using Weblate (Turkish) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/tr/ --- i18n-overlays/element-desktop/tr.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/element-desktop/tr.json b/i18n-overlays/element-desktop/tr.json index 0967ef4..f1a952b 100644 --- a/i18n-overlays/element-desktop/tr.json +++ b/i18n-overlays/element-desktop/tr.json @@ -1 +1,3 @@ -{} +{ + "Show": "Göster" +} From 01895fc35c884cebb6c9a32812ada84966c547bf Mon Sep 17 00:00:00 2001 From: metezd Date: Fri, 24 Jun 2022 15:07:24 +0000 Subject: [PATCH 011/100] Translated using Weblate (Turkish) Currently translated at 39.5% (19 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/tr/ --- i18n-overlays/matrix-react-sdk/tr.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/tr.json b/i18n-overlays/matrix-react-sdk/tr.json index 0967ef4..924de5a 100644 --- a/i18n-overlays/matrix-react-sdk/tr.json +++ b/i18n-overlays/matrix-react-sdk/tr.json @@ -1 +1,21 @@ -{} +{ + "Show message bubbles on one side only": "Mesaj baloncuklarını yalnızca bir tarafta göster", + "Show message bubbles depending on the width either on both sides or only on one side": "Genişliğe bağlı olarak mesaj baloncuklarını her iki tarafta veya sadece bir tarafta göster", + "Message bubbles": "Mesaj baloncukları", + "Normal priority": "Normal öncelik", + "Message layout": "Mesaj düzeni", + "Modern": "Modern", + "Update notifications": "Güncelleme bildirimleri", + "Don't ask again": "Bir daha sorma", + "System": "Sistem", + "Add custom theme": "Özel tema ekle", + "Theme in use": "Tema kullanımda", + "Light theme": "Açık tema", + "Dark theme": "Koyu tema", + "Uniform": "Düzenli", + "For people": "İnsanlar için", + "In group chats": "Grup sohbetlerinde", + "In public rooms": "Halka açık odalarda", + "Show people and rooms in a combined list": "Kişileri ve odaları birleşik bir listede göster", + "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).": "Yeni sürümler hakkında sizi bilgilendiren bir odaya katılmak ister misiniz? Bu oda özellikle platformunuz SchildiChat için otomatik güncellemeleri desteklemiyorsa (ör. Windows ve macOS) kullanışlıdır." +} From a89a4bc9e0d6785d459bdb89008d6112cfd3b25b Mon Sep 17 00:00:00 2001 From: metezd Date: Tue, 28 Jun 2022 12:02:26 +0000 Subject: [PATCH 012/100] Translated using Weblate (Turkish) Currently translated at 95.8% (46 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/tr/ --- i18n-overlays/matrix-react-sdk/tr.json | 29 +++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/tr.json b/i18n-overlays/matrix-react-sdk/tr.json index 924de5a..0856dee 100644 --- a/i18n-overlays/matrix-react-sdk/tr.json +++ b/i18n-overlays/matrix-react-sdk/tr.json @@ -17,5 +17,32 @@ "In group chats": "Grup sohbetlerinde", "In public rooms": "Halka açık odalarda", "Show people and rooms in a combined list": "Kişileri ve odaları birleşik bir listede göster", - "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).": "Yeni sürümler hakkında sizi bilgilendiren bir odaya katılmak ister misiniz? Bu oda özellikle platformunuz SchildiChat için otomatik güncellemeleri desteklemiyorsa (ör. Windows ve macOS) kullanışlıdır." + "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).": "Yeni sürümler hakkında sizi bilgilendiren bir odaya katılmak ister misiniz? Bu oda özellikle platformunuz SchildiChat için otomatik güncellemeleri desteklemiyorsa (ör. Windows ve macOS) kullanışlıdır.", + "If disabled, the space overview will be shown when switching to another space.": "Devre dışı bırakılırsa, başka bir alana geçerken alana ilişkin genel görünüm gösterilir.", + "Mark as unread": "Okunmadı olarak işaretle", + "User name color mode": "Kullanıcı adı renk modu", + "Show people in spaces": "İnsanları alanlarda göster", + "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Devre dışı bırakılmışsa, kişisel alanlara direkt mesajlar eklemeye devam edebilirsiniz. Etkinleştirilirse, alana üye olan herkesi otomatik olarak görürsünüz.", + "Show notification badges for People in Spaces": "Alanlardaki Kişiler için bildirim rozetlerini göster", + "Return to the room previously opened in a space": "Bir alanda daha önce açılmış olan odaya geri dön", + "Compact: tiny avatar together with name and preview in one line": "Sıkıştırılmış: tek satırda isim ve önizleme ile birlikte küçük avatar", + "Intermediate: medium sized avatar with single-line preview": "Orta: tek satır önizlemeli orta boy avatar", + "Roomy: big avatar with two-line preview": "Ferah: iki satırlık önizleme ile büyük avatar", + "Room list style": "Oda listesi tarzı", + "Hide advanced theme settings": "Gelişmiş tema ayarlarını gizle", + "Show all rooms in Home": "Ana sayfadaki tüm odaları göster", + "All rooms you're in will appear in Home.": "Bulunduğunuz tüm odalar ana sayfada görünecektir.", + "Show advanced theme settings": "Gelişmiş tema ayarlarını göster", + "Theme": "Tema", + "Font size and typeface": "Yazı tipi boyutu ve yazı karakteri", + "Room list": "Oda sıralaması", + "Mark rooms as unread": "Sohbetleri okunmamış olarak işaretlemeye izin ver", + "Mark as read": "Okundu olarak işaretle", + "Enable YouTube embed player": "YouTube gömülü oynatıcıyı etkinleştir", + "Collapse additional buttons": "Ek düğmeleri daralt", + "Corners": "Köşeler", + "Round": "Yuvarlak", + "Extra round": "Fazladan yuvarlak", + "Mixed": "Karışık", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Ana sayfa, her şeye genel bir bakış elde etmek için kullanışlıdır. Devre dışı bırakıldığında belirli odaları göremeyebileceğinizi unutmayın." } From c9333c24d5753c86f79c6e10c32b1fab332df324 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 7 Jul 2022 19:01:48 +0200 Subject: [PATCH 013/100] New test release v1.11.0-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 5fb3c3f..ce23be0 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 5fb3c3f8f21de8d82c76c76b56a8dd024b5e213d +Subproject commit ce23be00b4d891f8fb9c53f0d1f329b0d9542205 diff --git a/element-web b/element-web index 3e1e6f8..bfbc1ab 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 3e1e6f8413a452e77a41ddbb4bdd453fa8bd209f +Subproject commit bfbc1ab415c33979d4c72a0dc365630c1f6e43d8 diff --git a/matrix-js-sdk b/matrix-js-sdk index ee15b18..2a6db46 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f +Subproject commit 2a6db46dbe0ecbd79a71d5bffdf984e9807a8cbb diff --git a/matrix-react-sdk b/matrix-react-sdk index 5b96624..47fd53c 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 5b9662482613e3e74b49d7d8fa7684cda3dd839e +Subproject commit 47fd53c867e0ee572d8e9a5ed0b9f912b0cdc005 From c8df36cfc693a04196ee5b8651ad83662c00d1e3 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 14 Jul 2022 12:02:48 +0200 Subject: [PATCH 014/100] Add new strings for sound pack --- i18n-overlays/matrix-react-sdk/en_EN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index e45eaab..7732df7 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -46,5 +46,8 @@ "Corners": "Corners", "Round": "Round", "Extra round": "Extra round", - "Mixed": "Mixed" + "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" } From 8dfcd78f0103dc935c5b4c27fdfcf8e20870c652 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 14 Jul 2022 12:03:01 +0200 Subject: [PATCH 015/100] New test release v1.11.0-sc.0.test.2 --- 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 ce23be0..b0bfb5c 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit ce23be00b4d891f8fb9c53f0d1f329b0d9542205 +Subproject commit b0bfb5c2d37288edd7b814fc7ac97a96622a00fc diff --git a/element-web b/element-web index bfbc1ab..d9f6146 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit bfbc1ab415c33979d4c72a0dc365630c1f6e43d8 +Subproject commit d9f614624be0600c8c308b526577864087e95d97 diff --git a/matrix-js-sdk b/matrix-js-sdk index 2a6db46..dd3932f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 2a6db46dbe0ecbd79a71d5bffdf984e9807a8cbb +Subproject commit dd3932fcb705f445e8368855b27db95eb1f173b6 diff --git a/matrix-react-sdk b/matrix-react-sdk index 47fd53c..71fe48a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 47fd53c867e0ee572d8e9a5ed0b9f912b0cdc005 +Subproject commit 71fe48a9cea7b2c73e0b778aa8ed594e6755b4f8 From a96278bc44479126f77895a6a3480a5ee7903325 Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Thu, 14 Jul 2022 18:34:45 +0000 Subject: [PATCH 016/100] Translated using Weblate (Czech) Currently translated at 100.0% (51 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/cs/ --- i18n-overlays/matrix-react-sdk/cs.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index a8b9501..861e944 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -47,5 +47,8 @@ "Corners": "Rohy", "Round": "Oblé", "Extra round": "Kulaté", - "Mixed": "Smíšené" + "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" } From 97d058da1bc100d302597e4768434e78cf6dbee0 Mon Sep 17 00:00:00 2001 From: joshua Date: Fri, 15 Jul 2022 23:13:41 +0000 Subject: [PATCH 017/100] Translated using Weblate (Swedish) Currently translated at 100.0% (51 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sv/ --- i18n-overlays/matrix-react-sdk/sv.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 284a43a..9facd06 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -46,5 +46,8 @@ "Round": "Runda", "Extra round": "Extrarunda", "Mixed": "Blandad", - "Corners": "Hörn" + "Corners": "Hörn", + "Sound pack": "Ljudpaket", + "Schildi: Softer sounds for reduced anxiety": "Schildi: Mjukare ljud för minskad ångest", + "Classic: The same sharp sounds as Element": "Klassisk: Samma skarpa ljud som Element" } From 0f691d4dc674b980cca2276adea505f3a6143db7 Mon Sep 17 00:00:00 2001 From: Linerly Date: Fri, 15 Jul 2022 12:15:22 +0000 Subject: [PATCH 018/100] Translated using Weblate (Indonesian) Currently translated at 100.0% (51 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/id/ --- i18n-overlays/matrix-react-sdk/id.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index 0b8d8a5..c0d5cbb 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -46,5 +46,8 @@ "Corners": "Sudut", "Round": "Bulat", "Extra round": "Ekstra bulat", - "Mixed": "Campur" + "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" } From 5ce4f71da299ebccb271ac8cecb77d5e6de9b5c0 Mon Sep 17 00:00:00 2001 From: pixelcode Date: Thu, 28 Jul 2022 09:04:02 +0000 Subject: [PATCH 019/100] Translated using Weblate (German) Currently translated at 100.0% (51 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/ --- i18n-overlays/matrix-react-sdk/de_DE.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index 3bb30e2..d7d2ed2 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -148,5 +148,8 @@ "Mixed": "Gemischt", "Corners": "Ecken", "Extra round": "Extra rund", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst." + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst.", + "Classic: The same sharp sounds as Element": "Klassisch: Die gleichen scharfen Geräusche wie in Element", + "Sound pack": "Geräuschpaket", + "Schildi: Softer sounds for reduced anxiety": "Schildi: Sanftere Klänge für weniger Angstgefühle" } From 2bccbdbe575e3615324816b4988ed9517e89626d Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 1 Aug 2022 11:57:31 +0200 Subject: [PATCH 020/100] New test release v1.11.1-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 b0bfb5c..ba6b8bf 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit b0bfb5c2d37288edd7b814fc7ac97a96622a00fc +Subproject commit ba6b8bf283a92c3f80539eab5b1c62e396b6e93e diff --git a/element-web b/element-web index d9f6146..1203f15 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d9f614624be0600c8c308b526577864087e95d97 +Subproject commit 1203f1530d67863a4cb27d25851d46eecebf5685 diff --git a/matrix-js-sdk b/matrix-js-sdk index dd3932f..d0951b8 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit dd3932fcb705f445e8368855b27db95eb1f173b6 +Subproject commit d0951b83471f5fcabdfe14b5df497dc54acbeda4 diff --git a/matrix-react-sdk b/matrix-react-sdk index 71fe48a..f05b786 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 71fe48a9cea7b2c73e0b778aa8ed594e6755b4f8 +Subproject commit f05b786171f1d6997076a59764f359ed5d0fdc27 From 3757d1d7d694371cff9da429301793b7b82402fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Wed, 3 Aug 2022 01:59:23 +0000 Subject: [PATCH 021/100] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?= =?UTF-8?q?an=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 66.6% (34 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/nb_NO/ --- i18n-overlays/matrix-react-sdk/nb_NO.json | 26 ++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/nb_NO.json b/i18n-overlays/matrix-react-sdk/nb_NO.json index cd11a91..e3eb1c6 100644 --- a/i18n-overlays/matrix-react-sdk/nb_NO.json +++ b/i18n-overlays/matrix-react-sdk/nb_NO.json @@ -8,5 +8,29 @@ "Show message bubbles on one side only": "Vis meldingsbobler kun på én side", "Show message bubbles depending on the width either on both sides or only on one side": "Vis meldingsbobler avhengig av bredden enten på begge sider eller kun på én side", "Don't ask again": "Ikke spør igjen", - "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).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og 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).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og macOS).", + "Hide advanced theme settings": "Skjul avanserte draktinnstillinger", + "Show advanced theme settings": "Vis avanserte draktinnstillinger", + "Theme": "Drakt", + "Room list": "Romliste", + "Font size and typeface": "Størrelse på og type skrift", + "Sound pack": "Lydpakke", + "Schildi: Softer sounds for reduced anxiety": "Schildi: Mykere lyder for mindre angst", + "System": "System", + "Add custom theme": "Legg til egendefinert drakt", + "Theme in use": "Drakt i bruk", + "Light theme": "Lys drakt", + "Dark theme": "Mørk drakt", + "Mark as read": "Marker som lest", + "Mark rooms as unread": "Tillat markering av sludringer som uleste", + "Mark as unread": "Marker som ulest", + "In group chats": "I gruppesludringer", + "In public rooms": "I offentlige rom", + "For people": "For folk", + "Classic: The same sharp sounds as Element": "Klassisk: Samme skarpe lyder som Element", + "Collapse additional buttons": "Fold sammen ytterligere knapper", + "Corners": "Hjørner", + "Round": "Runde", + "Extra round": "Ekstra runde", + "Mixed": "Blandet" } From 7f80df5ca6d16d6cd194825c6253831d03bbce26 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 22 Aug 2022 23:33:14 +0200 Subject: [PATCH 022/100] New test release v1.11.3-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 ba6b8bf..bb09b97 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit ba6b8bf283a92c3f80539eab5b1c62e396b6e93e +Subproject commit bb09b97684db6927539a57ac05356bb7b6dffad3 diff --git a/element-web b/element-web index 1203f15..2a51d27 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1203f1530d67863a4cb27d25851d46eecebf5685 +Subproject commit 2a51d277c7bc83b1b001d1aae50574bfb812d488 diff --git a/matrix-js-sdk b/matrix-js-sdk index d0951b8..c2deb2a 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit d0951b83471f5fcabdfe14b5df497dc54acbeda4 +Subproject commit c2deb2a20e687b1ef566a3e21ae3c5c18b473dd1 diff --git a/matrix-react-sdk b/matrix-react-sdk index f05b786..bf34169 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit f05b786171f1d6997076a59764f359ed5d0fdc27 +Subproject commit bf34169e576fde32cc9b0384eed22220b311ef39 From a2a87f04ca7ad9b723b415272ef096b5ca342654 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 16:08:46 +0200 Subject: [PATCH 023/100] New test release v1.11.4-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 bb09b97..46855f6 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit bb09b97684db6927539a57ac05356bb7b6dffad3 +Subproject commit 46855f60e8a6f110ae8c88dfe79e3ce18f4929df diff --git a/element-web b/element-web index 2a51d27..f31e989 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2a51d277c7bc83b1b001d1aae50574bfb812d488 +Subproject commit f31e9899f3256c64495a6c3bdc28d28e0a5b237f diff --git a/matrix-js-sdk b/matrix-js-sdk index c2deb2a..12f88b5 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit c2deb2a20e687b1ef566a3e21ae3c5c18b473dd1 +Subproject commit 12f88b5b4ea4958c03c15bede071224080a50ded diff --git a/matrix-react-sdk b/matrix-react-sdk index bf34169..1ce24a8 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit bf34169e576fde32cc9b0384eed22220b311ef39 +Subproject commit 1ce24a82ed7928ad768af64a11d822886884c283 From 04cb55d6c3c554653965936fa77550bb732a6b6a Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 16:29:29 +0200 Subject: [PATCH 024/100] New test release v1.11.4-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 46855f6..c5897c9 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 46855f60e8a6f110ae8c88dfe79e3ce18f4929df +Subproject commit c5897c9412e17c29c43f721c3c48cec500911b4f diff --git a/element-web b/element-web index f31e989..7a9cdfe 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f31e9899f3256c64495a6c3bdc28d28e0a5b237f +Subproject commit 7a9cdfe392ad351b16ee261b9e3ee9ec5782fb67 diff --git a/matrix-react-sdk b/matrix-react-sdk index 1ce24a8..d4472ad 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 1ce24a82ed7928ad768af64a11d822886884c283 +Subproject commit d4472adb3a895e5b8d4bbcc435c3adac6e5ac170 From 05ff60b4c3445623b1b902f4e8c9ad6359848da6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 19:02:18 +0200 Subject: [PATCH 025/100] New release v1.11.4-sc.1 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index c5897c9..d65b86b 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit c5897c9412e17c29c43f721c3c48cec500911b4f +Subproject commit d65b86bd451608954aadaccba8210ea3e658a16e diff --git a/element-web b/element-web index 7a9cdfe..70a4064 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 7a9cdfe392ad351b16ee261b9e3ee9ec5782fb67 +Subproject commit 70a406478e2a7dcefdbc877d0f223d5e6623dd18 From cd8998da62dfdc8531ad8b1509f4ad61caf75fd8 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 22:04:10 +0200 Subject: [PATCH 026/100] Add script for changelog generation --- generate_changelog.sh | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100755 generate_changelog.sh diff --git a/generate_changelog.sh b/generate_changelog.sh new file mode 100755 index 0000000..3bca794 --- /dev/null +++ b/generate_changelog.sh @@ -0,0 +1,61 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" + +pushd "$mydir" > /dev/null + +source ./merge_helpers.sh + +# Check branch +check_branch $branch +forall_repos check_branch $branch + +# Ensure clean git state +forall_repos check_clean_git + +# Fetch upstream +forall_repos git fetch origin > /dev/null +forall_repos git fetch upstream > /dev/null + +( + # Add new line below git log: https://unix.stackexchange.com/a/345558 + + get_latest_upstream_tag + forelement_repos git log --pretty=format:"- %s" "sc" "^$latest_upstream_tag" "^master" \ + | printf '%s\n' "$(cat)" \ + | sed "s|Merge tag '\\(.*\\)' into sc.*|Update codebase to Element \1|" \ + | sed "s|Merge tag '\\(.*\\)' into merge.*|Update codebase to Element \1|" + + get_current_mxsdk_tags + + pushd "matrix-js-sdk" > /dev/null + git log --pretty=format:"- %s" "sc" "^$current_mxjssdk_tag" "^master" \ + | printf '%s\n' "$(cat)" \ + | grep -v "Merge .*tag" + popd > /dev/null + + pushd "matrix-react-sdk" > /dev/null + git log --pretty=format:"- %s" "sc" "^$current_mxreactsdk_tag" "^master" \ + | printf '%s\n' "$(cat)" \ + | grep -v "Merge .*tag" + popd > /dev/null +) \ + | grep -v "Automatic i18n reversion" \ + | grep -v "Automatic package.json reversion" \ + | grep -v "Merge .*branch" \ + | grep -v "Automatic theme update" \ + | grep -v "Automatic package.json adjustment" \ + | grep -v "Automatic i18n adjustment" \ + | grep -v "Update version to .*-sc\\..*" \ + | grep -v "\\.sh" \ + | grep -v "\\.md" \ + | grep -v "Added translation using Weblate" \ + | grep -v "Translated using Weblate" \ + | grep -v "weblate/sc" \ + | grep -v "\\[.*merge.*\\]" \ + | awk '!seen[$0]++' `# https://stackoverflow.com/a/1444448` \ + || echo "No significant changes since the last stable release" + +popd > /dev/null From dfa7921f9ad0141969faecc7e29c1b07886e1e4b Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 22:26:58 +0200 Subject: [PATCH 027/100] Makefile: fixup just too useful everywhere --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 95fd274..21c3bf4 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns -.PHONY: clean +.PHONY: clean undo_setup fixup CFGDIR ?= configs/sc @@ -166,3 +166,11 @@ clean: rm -rf element-web/dist rm -rf local-pkgbuild rm -f bom.lock + +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 + make setup + make clean + make setup From 30dc3ba5b9febbca7318ab433f53c1431091654e Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 23:11:51 +0200 Subject: [PATCH 028/100] readme: Debian node 16 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f4d437d..9b1ea85 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ The following are the dependencies required to build SchildiChat Web/Desktop on ``` # apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl -# curl -sL https://deb.nodesource.com/setup_14.x | bash - +# curl -sL https://deb.nodesource.com/setup_16.x | bash - # apt update # apt install nodejs From e886c4c135935a86e89d18f8110312de82c09349 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 15 Sep 2022 17:46:31 +0200 Subject: [PATCH 029/100] New test release v1.11.5-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 d65b86b..acf7d17 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit d65b86bd451608954aadaccba8210ea3e658a16e +Subproject commit acf7d174d2e91294db6b5c450d8bda5b7fde68dc diff --git a/element-web b/element-web index 70a4064..183a165 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 70a406478e2a7dcefdbc877d0f223d5e6623dd18 +Subproject commit 183a16501659bbd0f9a8178ebaa2c5a0ea252db5 diff --git a/matrix-js-sdk b/matrix-js-sdk index 12f88b5..e944aac 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 12f88b5b4ea4958c03c15bede071224080a50ded +Subproject commit e944aacab07f03fd8d13559243cbd240e4b7f2c3 diff --git a/matrix-react-sdk b/matrix-react-sdk index d4472ad..a552159 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d4472adb3a895e5b8d4bbcc435c3adac6e5ac170 +Subproject commit a55215909b7a1a526b2b11604f6327f2233232f2 From fc8900cf13c74790525901a2758307d83808dc23 Mon Sep 17 00:00:00 2001 From: Anonimas Date: Fri, 16 Sep 2022 17:58:33 +0000 Subject: [PATCH 030/100] Translated using Weblate (Lithuanian) Currently translated at 100.0% (51 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/lt/ --- i18n-overlays/matrix-react-sdk/lt.json | 34 +++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/lt.json b/i18n-overlays/matrix-react-sdk/lt.json index 2b32484..7013517 100644 --- a/i18n-overlays/matrix-react-sdk/lt.json +++ b/i18n-overlays/matrix-react-sdk/lt.json @@ -17,5 +17,37 @@ "In group chats": "Pokalbių grupėse", "In public rooms": "Viešuose kambariuose", "Show all rooms in Home": "Rodyti visus kambarius Pradžioje", - "All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje." + "All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje.", + "Hide advanced theme settings": "Slėpti išplėstinius temos nustatymus", + "Show advanced theme settings": "Rodyti išplėstinius temos nustatymus", + "Theme": "Tema", + "Font size and typeface": "Šrifto dydis ir raštas", + "Show message bubbles depending on the width either on both sides or only on one side": "Rodyti žinučių burbulus, priklausomai nuo pločio, abiejose pusėse arba tik vienoje pusėje", + "Sound pack": "Garso paketas", + "Schildi: Softer sounds for reduced anxiety": "Schildi: švelnesni garsai sumažintam nerimui", + "Classic: The same sharp sounds as Element": "Klasikiniai: Tie patys aštrūs garsai kaip ir Element", + "Enable YouTube embed player": "Įgalinti YouTube įterptą grotuvą", + "Add custom theme": "Pridėti pasirinktinę temą", + "Mark as unread": "Žymėti kaip neskaitytą", + "Mark as read": "Žymėti kaip perskaitytą", + "User name color mode": "Naudotojo vardo spalvų režimas", + "Uniform": "Vienodi", + "Show notification badges for People in Spaces": "Rodyti pranešimų ženkliukus žmonėms erdvėse", + "Return to the room previously opened in a space": "Grįžti į anksčiau atidarytą kambarį erdvėje", + "If disabled, the space overview will be shown when switching to another space.": "Jei išjungta, perjungiant į kitą erdvę bus rodoma erdvės apžvalga.", + "Room list style": "Kambarių sąrašo stilius", + "Compact: tiny avatar together with name and preview in one line": "Kompaktiška: mažytis avataras kartu su vardu ir peržiūra vienoje eilutėje", + "Intermediate: medium sized avatar with single-line preview": "Vidutinis: vidutinio dydžio avataras su vienos eilutės peržiūra", + "Roomy: big avatar with two-line preview": "Erdvus: didelis avataras su dviejų eilučių peržiūra", + "PowerLevel": "Galios lygis", + "For people": "Žmonėms", + "Show people in spaces": "Rodyti žmones erdvėse", + "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Jei išjungta, vis tiek galite pridėti tiesioginius pokalbius į asmenines erdves. Jei ši funkcija įjungta, automatiškai matysite visus, kurie yra erdvės nariai.", + "Mark rooms as unread": "Leisti žymėti pokalbius kaip neskaitytus", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Pradžia yra naudinga, kad galėtumėte viską apžvelgti. Turėkite omenyje, kad ją išjungę galite nematyti tam tikrų kambarių.", + "Collapse additional buttons": "Sulankstyti papildomus mygtukus", + "Corners": "Kampai", + "Round": "Apvalus", + "Extra round": "Ypač apvalus", + "Mixed": "Mišrus" } From 6c5136d8445bd524157823307500212350e37a15 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 28 Sep 2022 13:08:02 +0200 Subject: [PATCH 031/100] New test release v1.11.6-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 acf7d17..6649063 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit acf7d174d2e91294db6b5c450d8bda5b7fde68dc +Subproject commit 66490633aab37e120a68c8e0e895dfdb6a583f29 diff --git a/element-web b/element-web index 183a165..8ed0e54 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 183a16501659bbd0f9a8178ebaa2c5a0ea252db5 +Subproject commit 8ed0e546a9cdae94b58e154d8d3fbd404220bf72 diff --git a/matrix-js-sdk b/matrix-js-sdk index e944aac..cb81a65 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit e944aacab07f03fd8d13559243cbd240e4b7f2c3 +Subproject commit cb81a65097a0bb861da9e7384cb7469ed42e7a58 diff --git a/matrix-react-sdk b/matrix-react-sdk index a552159..d140a7a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit a55215909b7a1a526b2b11604f6327f2233232f2 +Subproject commit d140a7a09455dc85f837080fd778d24c9166968f From a7c084d6f8c93e1de08808f31760d1c149bdb667 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 28 Sep 2022 13:35:57 +0200 Subject: [PATCH 032/100] New test release v1.11.6-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 6649063..e8138b9 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 66490633aab37e120a68c8e0e895dfdb6a583f29 +Subproject commit e8138b904e656a28f0a2ad260f3ab9f5d85af401 diff --git a/element-web b/element-web index 8ed0e54..ed7c271 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 8ed0e546a9cdae94b58e154d8d3fbd404220bf72 +Subproject commit ed7c271bc8028760639bdee69387bc58956c556b diff --git a/matrix-react-sdk b/matrix-react-sdk index d140a7a..a8c4ff4 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d140a7a09455dc85f837080fd778d24c9166968f +Subproject commit a8c4ff42459a33610b1cba4105b9cdc4f52eaa64 From 95d46b08b4260f1a0e189105fffb6f0471f3473d Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 28 Sep 2022 14:34:33 +0200 Subject: [PATCH 033/100] New test release v1.11.6-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 e8138b9..cbcbe7f 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit e8138b904e656a28f0a2ad260f3ab9f5d85af401 +Subproject commit cbcbe7ff684f4200e362d0bc7178281b2c79d89b diff --git a/element-web b/element-web index ed7c271..8a4c07f 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ed7c271bc8028760639bdee69387bc58956c556b +Subproject commit 8a4c07f24559dc0888413f9fc714d1bb6eecfecb diff --git a/matrix-react-sdk b/matrix-react-sdk index a8c4ff4..eb6b8d0 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit a8c4ff42459a33610b1cba4105b9cdc4f52eaa64 +Subproject commit eb6b8d0b878102c5fe7420e185667e450f99cf7a From 77fbeb625cc885e229f3e2eb1b5aea11f2d0ede5 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 28 Sep 2022 19:49:26 +0200 Subject: [PATCH 034/100] New release v1.11.8-sc.1 --- element-desktop | 2 +- element-web | 2 +- generate_changelog.sh | 4 ++-- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/element-desktop b/element-desktop index cbcbe7f..0be4f8f 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit cbcbe7ff684f4200e362d0bc7178281b2c79d89b +Subproject commit 0be4f8fcb49e4c0c66f3b63c69cb91711092f461 diff --git a/element-web b/element-web index 8a4c07f..ef58800 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 8a4c07f24559dc0888413f9fc714d1bb6eecfecb +Subproject commit ef58800f2c6c1d47501cbd4628fdef67aaf7a5ca diff --git a/generate_changelog.sh b/generate_changelog.sh index 3bca794..1e65601 100755 --- a/generate_changelog.sh +++ b/generate_changelog.sh @@ -16,8 +16,8 @@ forall_repos check_branch $branch forall_repos check_clean_git # Fetch upstream -forall_repos git fetch origin > /dev/null -forall_repos git fetch upstream > /dev/null +forall_repos git fetch origin > /dev/null 2>/dev/null +forall_repos git fetch upstream > /dev/null 2>/dev/null ( # Add new line below git log: https://unix.stackexchange.com/a/345558 diff --git a/matrix-js-sdk b/matrix-js-sdk index cb81a65..c2f7795 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit cb81a65097a0bb861da9e7384cb7469ed42e7a58 +Subproject commit c2f77957a32ff3ce7ead38aa483aa34b827423db diff --git a/matrix-react-sdk b/matrix-react-sdk index eb6b8d0..0d5ad44 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit eb6b8d0b878102c5fe7420e185667e450f99cf7a +Subproject commit 0d5ad44950f5a637813c2fc3fcc3e24426dbba4b From b9d35c0cc10d12f3d4af25ffba200977410f80d9 Mon Sep 17 00:00:00 2001 From: autoteelar Date: Wed, 26 Oct 2022 10:50:41 +0200 Subject: [PATCH 035/100] Added translation using Weblate (Japanese) --- i18n-overlays/matrix-react-sdk/ja.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/matrix-react-sdk/ja.json diff --git a/i18n-overlays/matrix-react-sdk/ja.json b/i18n-overlays/matrix-react-sdk/ja.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/matrix-react-sdk/ja.json @@ -0,0 +1 @@ +{} From c2318080eb5f8702006fe2560c77b9c31805bbae Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 26 Oct 2022 10:50:49 +0200 Subject: [PATCH 036/100] Added translation using Weblate (Japanese) --- i18n-overlays/element-web/ja.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/element-web/ja.json diff --git a/i18n-overlays/element-web/ja.json b/i18n-overlays/element-web/ja.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-web/ja.json @@ -0,0 +1 @@ +{} From 92599de20a2546f94bcf6e4d7c668283e939632a Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 26 Oct 2022 10:50:50 +0200 Subject: [PATCH 037/100] Added translation using Weblate (Japanese) --- i18n-overlays/element-desktop/ja.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/element-desktop/ja.json diff --git a/i18n-overlays/element-desktop/ja.json b/i18n-overlays/element-desktop/ja.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-desktop/ja.json @@ -0,0 +1 @@ +{} From ae1e15dcef70345d5a469d2bb62e4eee294892d4 Mon Sep 17 00:00:00 2001 From: autoteelar Date: Wed, 26 Oct 2022 09:00:38 +0000 Subject: [PATCH 038/100] Translated using Weblate (Japanese) Currently translated at 1.9% (1 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/ja/ --- i18n-overlays/matrix-react-sdk/ja.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/ja.json b/i18n-overlays/matrix-react-sdk/ja.json index 0967ef4..fedc533 100644 --- a/i18n-overlays/matrix-react-sdk/ja.json +++ b/i18n-overlays/matrix-react-sdk/ja.json @@ -1 +1,3 @@ -{} +{ + "Normal priority": "常優先度" +} From e22b6bb03124e9a0d86fa7aaab1aa59216906587 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 29 Oct 2022 23:41:13 +0200 Subject: [PATCH 039/100] New test release v1.11.12-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 0be4f8f..6ecf8c3 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 0be4f8fcb49e4c0c66f3b63c69cb91711092f461 +Subproject commit 6ecf8c30e0f96bd078dbdcd421f48418f54a91ed diff --git a/element-web b/element-web index ef58800..a75d0d9 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ef58800f2c6c1d47501cbd4628fdef67aaf7a5ca +Subproject commit a75d0d9055906f44503acb8f1152260e02c6547f diff --git a/matrix-js-sdk b/matrix-js-sdk index c2f7795..9b20f5c 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit c2f77957a32ff3ce7ead38aa483aa34b827423db +Subproject commit 9b20f5c3ef02568ee302f0c6ed633f07f7f8e498 diff --git a/matrix-react-sdk b/matrix-react-sdk index 0d5ad44..68f9948 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 0d5ad44950f5a637813c2fc3fcc3e24426dbba4b +Subproject commit 68f99488f590bb3623ee2bcf096a697e8d38505b From 6bc26949c13a4153061ed2692830c6804e7b6ea1 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 30 Oct 2022 12:08:59 +0100 Subject: [PATCH 040/100] New test release v1.11.12-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 6ecf8c3..87b2e3d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 6ecf8c30e0f96bd078dbdcd421f48418f54a91ed +Subproject commit 87b2e3d7a3158c999b480e13fb23ab5774237dd9 diff --git a/element-web b/element-web index a75d0d9..886408b 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit a75d0d9055906f44503acb8f1152260e02c6547f +Subproject commit 886408b58153fb15f9691c6ac0f3c31aec40f261 diff --git a/matrix-react-sdk b/matrix-react-sdk index 68f9948..e3761d8 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 68f99488f590bb3623ee2bcf096a697e8d38505b +Subproject commit e3761d887d8987f4b97b567962bb453f901c5f72 From e26d244c1eafe9e128ab1a35cbd6eb927a943713 Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 4 Nov 2022 21:17:04 +0100 Subject: [PATCH 041/100] New test release v1.11.13-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 87b2e3d..4912004 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 87b2e3d7a3158c999b480e13fb23ab5774237dd9 +Subproject commit 4912004b86dc44cb49e7afcbae64a54fe57f38c6 diff --git a/element-web b/element-web index 886408b..2abfc19 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 886408b58153fb15f9691c6ac0f3c31aec40f261 +Subproject commit 2abfc19777acff294a8f2895a9daef65163e7c2c diff --git a/matrix-js-sdk b/matrix-js-sdk index 9b20f5c..679ba69 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 9b20f5c3ef02568ee302f0c6ed633f07f7f8e498 +Subproject commit 679ba691ef8bbca0d3518411523c017e2ad8cdf9 diff --git a/matrix-react-sdk b/matrix-react-sdk index e3761d8..eb43745 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit e3761d887d8987f4b97b567962bb453f901c5f72 +Subproject commit eb43745d74433927e367d8efdc7ad0735b6a28b1 From 3c405aeaf65d62b0a68b905ac6e6ae652965a159 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Nov 2022 20:22:09 +0100 Subject: [PATCH 042/100] New release v1.11.13-sc.1 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 4912004..3d6ff48 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 4912004b86dc44cb49e7afcbae64a54fe57f38c6 +Subproject commit 3d6ff486d4a8cafd018aa697dd9e764e729baaac diff --git a/element-web b/element-web index 2abfc19..1f45edd 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2abfc19777acff294a8f2895a9daef65163e7c2c +Subproject commit 1f45edd3d08cf91e982e15c575d1c348956101b2 From b6fe9591539bcc47dc10f61e1717f225a8012a07 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Nov 2022 22:41:56 +0100 Subject: [PATCH 043/100] =?UTF-8?q?Meh,=20flathub=20seems=20to=20require?= =?UTF-8?q?=20PRs=20now=20=F0=9F=90=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/update-flathub.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/update-flathub.sh b/deploy/update-flathub.sh index 31c4ce5..7451aec 100755 --- a/deploy/update-flathub.sh +++ b/deploy/update-flathub.sh @@ -20,8 +20,11 @@ debdate=$(date +%Y-%m-%d -r $debpath) pushd "$repopath" > /dev/null git fetch +git checkout master git reset --hard origin/master +git checkout -B "release-v$version" + yamlFile="chat.schildi.desktop.yaml" xmlFile="chat.schildi.desktop.metainfo.xml" @@ -33,8 +36,8 @@ sed -i "s|^\s\s$| \n /dev/null -echo "Release v$version published on flathub!" +echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/" From 0bfa5733d5e50816c6d15a24392606b5f0d06e98 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 12 Nov 2022 11:28:31 +0100 Subject: [PATCH 044/100] New test release v1.11.14-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 3d6ff48..07d1283 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 3d6ff486d4a8cafd018aa697dd9e764e729baaac +Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00 diff --git a/element-web b/element-web index 1f45edd..d7e4930 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1f45edd3d08cf91e982e15c575d1c348956101b2 +Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b diff --git a/matrix-js-sdk b/matrix-js-sdk index 679ba69..1474204 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 679ba691ef8bbca0d3518411523c017e2ad8cdf9 +Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676 diff --git a/matrix-react-sdk b/matrix-react-sdk index eb43745..c9fb6bb 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit eb43745d74433927e367d8efdc7ad0735b6a28b1 +Subproject commit c9fb6bbbb8bf97802277127601163618669acdee From 92ac040175759ff476bc6aada6874f485dd4a118 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 15 Nov 2022 23:39:05 +0100 Subject: [PATCH 045/100] Renovate config.json - default_server_name --> default_server_config - Add more room directories --- configs/sc/config.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/sc/config.json b/configs/sc/config.json index 2916dee..4af6da3 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -1,6 +1,11 @@ { "update_base_url": null, - "default_server_name": "matrix.org", + "default_server_config": { + "m.homeserver": { + "base_url": "https://matrix-client.matrix.org", + "server_name": "matrix.org" + } + }, "brand": "SchildiChat", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", @@ -14,7 +19,10 @@ "showLabsSettings": true, "roomDirectory": { "servers": [ - "matrix.org" + "matrix.org", + "gitter.im", + "libera.chat", + "schildi.chat" ] }, "enable_presence_by_hs_url": { From 51e7d4b67b71543370c88277007983e51f7a6154 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 26 Nov 2022 00:30:33 +0100 Subject: [PATCH 046/100] New test release v1.11.15-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 07d1283..dd74e36 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00 +Subproject commit dd74e3628176f0ad39097325e5603fec51408a83 diff --git a/element-web b/element-web index d7e4930..fcf043c 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b +Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d diff --git a/matrix-js-sdk b/matrix-js-sdk index 1474204..6128de1 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676 +Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636 diff --git a/matrix-react-sdk b/matrix-react-sdk index c9fb6bb..0ad473a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit c9fb6bbbb8bf97802277127601163618669acdee +Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e From fc27cbfd7476e5b494349e288c6d04e7d5f881c1 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 4 Dec 2022 02:37:55 +0100 Subject: [PATCH 047/100] Allow building using containers Co-authored-by: Paarth Shah Closes #145 --- .containerignore | 1 + Containerfile.debian | 30 ++++++++++++++++++++++++++++++ Containerfile.fedora | 20 ++++++++++++++++++++ Makefile | 25 +++++++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 .containerignore create mode 100644 Containerfile.debian create mode 100644 Containerfile.fedora diff --git a/.containerignore b/.containerignore new file mode 100644 index 0000000..ae02570 --- /dev/null +++ b/.containerignore @@ -0,0 +1 @@ +release/ \ No newline at end of file diff --git a/Containerfile.debian b/Containerfile.debian new file mode 100644 index 0000000..041c64e --- /dev/null +++ b/Containerfile.debian @@ -0,0 +1,30 @@ +ARG NODE_VERSION +FROM node:${NODE_VERSION} + +RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \ + curl \ + g++ \ + gcc \ + git \ + jq \ + libarchive-tools \ + libsecret-1-dev \ + libsqlcipher-dev \ + libssl-dev \ + make \ + openssl \ + pkg-config \ + python \ + tcl \ + vim + +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal + +COPY . /project +WORKDIR /project + +# There might be remnants of the host which break the build +RUN make fixup \ No newline at end of file diff --git a/Containerfile.fedora b/Containerfile.fedora new file mode 100644 index 0000000..279d43f --- /dev/null +++ b/Containerfile.fedora @@ -0,0 +1,20 @@ +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 + +# node setup +ARG NODE_VERSION +RUN mkdir -p /usr/local/n +RUN mkdir -p /usr/local/bin /usr/local/lib /usr/local/include /usr/local/share +RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n +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 + +COPY . /project +WORKDIR /project + +# There might be remnants of the host which break the build +RUN make fixup \ No newline at end of file diff --git a/Makefile b/Makefile index 21c3bf4..c517e5b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns +.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 CFGDIR ?= configs/sc @@ -8,6 +10,8 @@ CFGDIR ?= configs/sc all: web YARN ?= yarnpkg +CONTAINER_ENGINE ?= podman +NODE_VERSION ?= 16 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|') WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|') @@ -32,6 +36,9 @@ OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION) OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app +CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian +CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora + RELEASE_DIR := release CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION) @@ -153,6 +160,24 @@ macos-mas-release: macos-mas mkdir -p $(CURRENT_RELEASE_DIR) cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR) +container-build-debian: + $(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) . + +container-build-fedora: + $(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) . + +container-web-release: container-build-debian + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release + +container-debian-release: container-build-debian + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release + +container-rpm-release: container-build-fedora + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release + +container-appimage-release: container-build-debian + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release + bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock ./build-bom.sh bom: bom.lock From a4ab5f55c92db470926b80239e14a1a132ff4fec Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 4 Dec 2022 02:56:38 +0100 Subject: [PATCH 048/100] New test release v1.11.15-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 dd74e36..d25e426 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit dd74e3628176f0ad39097325e5603fec51408a83 +Subproject commit d25e426c42d4eeef4fd62aea61642fd66fe7f73b diff --git a/element-web b/element-web index fcf043c..ebb0d6a 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d +Subproject commit ebb0d6a212299540247587abd345ce633a414813 diff --git a/matrix-react-sdk b/matrix-react-sdk index 0ad473a..23de404 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e +Subproject commit 23de404c637747b5f2662b12355b0cbc4ab0d951 From eb17c2ad9459437d06d834307b4d5ff23051f80a Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 6 Dec 2022 20:08:30 +0100 Subject: [PATCH 049/100] New test release v1.11.16-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 d25e426..dfc6afa 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit d25e426c42d4eeef4fd62aea61642fd66fe7f73b +Subproject commit dfc6afa8d8d8e100010d67a3aa328e99ec9813de diff --git a/element-web b/element-web index ebb0d6a..91850ae 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ebb0d6a212299540247587abd345ce633a414813 +Subproject commit 91850ae97a951c4c011d9767203b839a274c2b55 diff --git a/matrix-js-sdk b/matrix-js-sdk index 6128de1..789e2bf 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636 +Subproject commit 789e2bf3f3b6abd0877e50df29802b1382a8399f diff --git a/matrix-react-sdk b/matrix-react-sdk index 23de404..2d34475 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 23de404c637747b5f2662b12355b0cbc4ab0d951 +Subproject commit 2d34475d29e074c6f35623f2882c09c95b31dd70 From 9d4602fea6068e42e02a0edfdb4efcd7407d0b57 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 23 Dec 2022 10:14:00 +0100 Subject: [PATCH 050/100] Add stale automation github action --- .github/workflows/stale.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000..674a67d --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,17 @@ +name: 'Close stale issues' +on: + schedule: + - cron: '30 1 * * *' + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v6 + with: + stale-issue-message: 'This issue is stale because it has been open 150 days with no activity. Remove stale label or comment or this will be closed in 14 days.' + days-before-issue-stale: 150 + days-before-issue-close: 14 + days-before-pr-stale: -1 + days-before-pr-close: -1 + exempt-issue-labels: 'longterm,enhancement,parity-with-android,prio:medium,prio:high,electron issue,encrypted room search,build infrastructure' From 775fb00b75bb2c245ddbfedb6d0fd098f5ab8595 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 15 Jan 2023 12:31:07 +0100 Subject: [PATCH 051/100] Adjust default config.json to changed property names --- configs/sc/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/sc/config.json b/configs/sc/config.json index 4af6da3..0402a78 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -16,8 +16,8 @@ "https://scalar-staging.vector.im/api", "https://scalar-staging.riot.im/scalar/api" ], - "showLabsSettings": true, - "roomDirectory": { + "show_labs_settings": true, + "room_directory": { "servers": [ "matrix.org", "gitter.im", From 965a3b2d0e7df545105e084c82e26de0ff6ef03b Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 15 Jan 2023 12:33:34 +0100 Subject: [PATCH 052/100] New test release v1.11.17-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 dfc6afa..86f7509 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit dfc6afa8d8d8e100010d67a3aa328e99ec9813de +Subproject commit 86f7509f07039d94f43c3736518425eef0d43b3a diff --git a/element-web b/element-web index 91850ae..02ec7bb 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 91850ae97a951c4c011d9767203b839a274c2b55 +Subproject commit 02ec7bb3b0ffa47aca0d59a92788ef55ef481e78 diff --git a/matrix-js-sdk b/matrix-js-sdk index 789e2bf..b9afe23 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 789e2bf3f3b6abd0877e50df29802b1382a8399f +Subproject commit b9afe2320caee4969dc64c09ba680f0041e3ca5a diff --git a/matrix-react-sdk b/matrix-react-sdk index 2d34475..7ebde05 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 2d34475d29e074c6f35623f2882c09c95b31dd70 +Subproject commit 7ebde053f052965a463ab5b710110be33a2f4a1c From db908634ea8d9deb21e1972d21efdf24a846e6b7 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 19 Jan 2023 18:22:08 +0100 Subject: [PATCH 053/100] New test release v1.11.19-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 86f7509..6e19b2e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 86f7509f07039d94f43c3736518425eef0d43b3a +Subproject commit 6e19b2eae6fa3e362d25166655c419f90d70f2db diff --git a/element-web b/element-web index 02ec7bb..172df12 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 02ec7bb3b0ffa47aca0d59a92788ef55ef481e78 +Subproject commit 172df12d60ea12d00cec7c2e0dbc4607356e4a4e diff --git a/matrix-js-sdk b/matrix-js-sdk index b9afe23..e6c127a 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit b9afe2320caee4969dc64c09ba680f0041e3ca5a +Subproject commit e6c127a392ec5165ce348b84ff1290efbef0f1cb diff --git a/matrix-react-sdk b/matrix-react-sdk index 7ebde05..bba6767 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 7ebde053f052965a463ab5b710110be33a2f4a1c +Subproject commit bba676718ad4f5de627909036804f5b050af71f7 From 32f58e1c3fb1ae37742d2a7115789a8a67ac2f8f Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 30 Jan 2023 23:43:21 +0100 Subject: [PATCH 054/100] New test release v1.11.20-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 6e19b2e..8f68fc6 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 6e19b2eae6fa3e362d25166655c419f90d70f2db +Subproject commit 8f68fc6612d1ca13fe97df744ad2538da1f9ade7 diff --git a/element-web b/element-web index 172df12..62767ba 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 172df12d60ea12d00cec7c2e0dbc4607356e4a4e +Subproject commit 62767baf0e17758cce1422614028869d90ba68a4 diff --git a/matrix-js-sdk b/matrix-js-sdk index e6c127a..d89e210 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit e6c127a392ec5165ce348b84ff1290efbef0f1cb +Subproject commit d89e210512f102196c66045c69ee69d767468b4b diff --git a/matrix-react-sdk b/matrix-react-sdk index bba6767..dd020a8 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit bba676718ad4f5de627909036804f5b050af71f7 +Subproject commit dd020a8866e8ee321f4ec403f410dc6ada265171 From ae4eb4c3da22d66dfc629c331c66f8fb60b8174f Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 1 Feb 2023 16:51:20 +0100 Subject: [PATCH 055/100] 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 056/100] 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 057/100] 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 058/100] 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 059/100] 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 060/100] 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 061/100] 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 062/100] 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 063/100] 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 064/100] 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 065/100] 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 066/100] 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 067/100] 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 068/100] 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 069/100] 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 070/100] 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 071/100] 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 072/100] 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 073/100] 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 074/100] 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 075/100] 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 From be44d4a1a651383b04e4e1e6f68b7f8b9524f9a2 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 25 Apr 2023 23:23:49 +0200 Subject: [PATCH 076/100] New release v1.11.30-sc.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 a8b266d..2f54ef6 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit a8b266dd964b97282caaa4c43a90e9bf6a95f9a4 +Subproject commit 2f54ef60617db8b5d4a8acdb3ae90721d05de3b3 diff --git a/element-web b/element-web index 2ca5291..f3e6edb 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2ca5291da7501ee50d3f24717cdfcb8d27aebfe5 +Subproject commit f3e6edbe968d21abe48fc64cb2fe93fffd69c4fd diff --git a/matrix-react-sdk b/matrix-react-sdk index d8cf78a..9e45813 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d8cf78aa21f2aeb8ab444a4dd3d7e9f90fea59b2 +Subproject commit 9e4581350e1b5b78263558ec992090f450e3ac96 From 0ba494e9559ab39a4dd0a936c3d33b9f09ac064b Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 25 Apr 2023 23:53:41 +0200 Subject: [PATCH 077/100] 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 078/100] 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 079/100] 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 080/100] 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 081/100] 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 082/100] 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 083/100] 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 084/100] 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 085/100] 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 086/100] 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 087/100] 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 088/100] 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 From aae0f2868e8dcf0789dd9ba7290bdde92baca176 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 19:37:16 +0100 Subject: [PATCH 089/100] New test release v1.11.36-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 738de77..cbd51cb 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 738de7784bddb2285d2f015102e8e2e15877decb +Subproject commit cbd51cb2e95298d1992bceaf1b7cd8d0e4fbc786 diff --git a/element-web b/element-web index ecf1586..ed6795a 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ecf1586a0f83a9fbce1c95290f1520a64848d894 +Subproject commit ed6795ae7a77235e547193011b9dd54c9e8412b8 diff --git a/matrix-react-sdk b/matrix-react-sdk index 3638445..361a49f 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 363844517bc5e55327c459a0d0f3a3280a975d10 +Subproject commit 361a49f235d7e267958bfe8dc653e1e777a5861c From e9faf9ab15ad5e375e785b120e7643b273f675c8 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 19:43:25 +0100 Subject: [PATCH 090/100] Bump node version from 16 to 18 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 205cea9..3c86970 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ all: web YARN ?= yarnpkg CONTAINER_ENGINE ?= podman -NODE_VERSION ?= 16 +NODE_VERSION ?= 18 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|') WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|') From 90912a5d0700e82b514e5ff9afd468db58e583ec Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 24 Feb 2024 19:36:32 +0100 Subject: [PATCH 091/100] Fix debian container compile --- Containerfile.debian | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile.debian b/Containerfile.debian index 041c64e..f079562 100644 --- a/Containerfile.debian +++ b/Containerfile.debian @@ -1,5 +1,5 @@ ARG NODE_VERSION -FROM node:${NODE_VERSION} +FROM node:${NODE_VERSION}-buster RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \ curl \ @@ -27,4 +27,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 1338cf06041b77b557f31f37b26a8c2066072c55 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 21:45:02 +0100 Subject: [PATCH 092/100] Fix containerbuilds, also always use host directory as project directory --- Containerfile.fedora | 13 +++++++------ Makefile | 17 ++++++++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index a61578c..2ac846d 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ -FROM fedora:latest +FROM docker.io/fedora:38 -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 +RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat # node setup ARG NODE_VERSION @@ -13,8 +13,9 @@ RUN npm install -g yarn RUN npm install -g node-gyp RUN gem install --no-user-install --no-document fpm -COPY . /project -WORKDIR /project +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal -# There might be remnants of the host which break the build -RUN make fixup +WORKDIR /project \ No newline at end of file diff --git a/Makefile b/Makefile index 3c86970..074b8fa 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns .PHONY: container-build-debian container-build-fedora -.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release +.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release container-local-pkgbuild .PHONY: clean undo_setup fixup .PHONY: fix_yarn_cache @@ -162,22 +162,25 @@ macos-mas-release: macos-mas cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR) container-build-debian: - $(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) . + $(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) . container-build-fedora: - $(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) . + $(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) . container-web-release: container-build-debian - $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release container-debian-release: container-build-debian - $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release container-rpm-release: container-build-fedora - $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release container-appimage-release: container-build-debian - $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release + +container-local-pkgbuild: container-build-debian + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make local-pkgbuild bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock ./build-bom.sh From 446b55792fd71650bfc5ac5c800861227a05969d Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 22:28:53 +0100 Subject: [PATCH 093/100] This got lost while rebasing --- Containerfile.debian | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Containerfile.debian b/Containerfile.debian index f079562..c8c75ba 100644 --- a/Containerfile.debian +++ b/Containerfile.debian @@ -23,8 +23,4 @@ ENV RUSTUP_HOME=/usr/local/rustup \ PATH=/usr/local/cargo/bin:$PATH RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal -COPY . /project -WORKDIR /project - -# There might be remnants of the host which break the build -RUN make fixup +WORKDIR /project \ No newline at end of file From 9241a6d044873acae993f6d1e2f9809d0624965d Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 22:29:48 +0100 Subject: [PATCH 094/100] Use fully qualified name here as well --- Containerfile.debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.debian b/Containerfile.debian index c8c75ba..85222fc 100644 --- a/Containerfile.debian +++ b/Containerfile.debian @@ -1,5 +1,5 @@ ARG NODE_VERSION -FROM node:${NODE_VERSION}-buster +FROM docker.io/node:${NODE_VERSION}-buster RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \ curl \ From ab496f797715fd2641a5045d2fa65f3478c80de7 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 25 Feb 2024 20:36:48 +0100 Subject: [PATCH 095/100] Fully containerized release builds --- Containerfile.windows | 13 +++++++++++++ Makefile | 15 +++++++++++++-- matrix-react-sdk | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 Containerfile.windows diff --git a/Containerfile.windows b/Containerfile.windows new file mode 100644 index 0000000..0c0776a --- /dev/null +++ b/Containerfile.windows @@ -0,0 +1,13 @@ +ARG CONTAINER_IMAGE_DEBIAN +FROM ${CONTAINER_IMAGE_DEBIAN}:latest + +RUN dpkg --add-architecture i386 && apt-get update && apt-get install --no-install-recommends -y \ + wine \ + wine32 \ + wine64 \ + libwine \ + libwine:i386 \ + fonts-wine \ + zip + +WORKDIR /project \ No newline at end of file diff --git a/Makefile b/Makefile index 074b8fa..7ac67c1 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns -.PHONY: container-build-debian container-build-fedora -.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release container-local-pkgbuild +.PHONY: container-build-debian container-build-fedora container-build-windows +.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release container-windows-release container-release container-local-pkgbuild .PHONY: clean undo_setup fixup .PHONY: fix_yarn_cache @@ -39,6 +39,7 @@ OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora +CONTAINER_IMAGE_WINDOWS := schildichat-desktop-containerbuild-windows RELEASE_DIR := release CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION) @@ -167,6 +168,9 @@ container-build-debian: container-build-fedora: $(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) . +container-build-windows: container-build-debian + $(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_WINDOWS) -f Containerfile.windows --build-arg CONTAINER_IMAGE_DEBIAN=$(CONTAINER_IMAGE_DEBIAN) . + container-web-release: container-build-debian $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release @@ -179,6 +183,13 @@ container-rpm-release: container-build-fedora container-appimage-release: container-build-debian $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release +container-windows-release: container-build-windows + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make windows-release + +container-release: container-build-windows container-build-fedora + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make web-release debian-release appimage-release windows-setup-release windows-portable-release + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release + container-local-pkgbuild: container-build-debian $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make local-pkgbuild diff --git a/matrix-react-sdk b/matrix-react-sdk index 361a49f..7aca4ab 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 361a49f235d7e267958bfe8dc653e1e777a5861c +Subproject commit 7aca4ab6c0a0ab96382eeb4fe3470698f31b4d44 From 9f8bad4ea516f7b5380dc347e1fc55a55b937295 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 25 Feb 2024 20:36:56 +0100 Subject: [PATCH 096/100] New release v1.11.36-sc.1 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index cbd51cb..07a530e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit cbd51cb2e95298d1992bceaf1b7cd8d0e4fbc786 +Subproject commit 07a530ef7d811223c224520ad973aac0230ece67 diff --git a/element-web b/element-web index ed6795a..6e9a004 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ed6795ae7a77235e547193011b9dd54c9e8412b8 +Subproject commit 6e9a004b0d57cd1bbd26ff2624de45c259be0412 From 4dcd73f0839c0dd1cfd19c6b8ba8bfab0834e3db Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 25 Feb 2024 20:56:48 +0100 Subject: [PATCH 097/100] Changed sqlcipher variable name --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7ac67c1..472d391 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ web: setup desktop-common: web $(YARN) --cwd element-desktop run fetch --cfgdir '' - SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native + SQLCIPHER_BUNDLED=1 $(YARN) --cwd element-desktop run build:native macos-common: web icns $(YARN) --cwd element-desktop run fetch --cfgdir '' From 48fb86093a8702092e4954c1d4ee61f4da9cc3be Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 25 Feb 2024 21:01:22 +0100 Subject: [PATCH 098/100] New release v1.11.36-sc.2 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 07a530e..7252cf8 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 07a530ef7d811223c224520ad973aac0230ece67 +Subproject commit 7252cf854ba614f7df7cbd20f8fa163316a6eb33 diff --git a/element-web b/element-web index 6e9a004..e625706 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 6e9a004b0d57cd1bbd26ff2624de45c259be0412 +Subproject commit e6257065c1164f7e786d412050945626d834faac From 4b0435ef3b82d3c5a08ddc9526bfe8a872991d49 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 26 Feb 2024 10:45:34 +0100 Subject: [PATCH 099/100] Fix fedora container build See: https://stackoverflow.com/a/74330717/4515820 --- Containerfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index 2ac846d..a886a89 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ FROM docker.io/fedora:38 -RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat +RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat pkgconf perl # node setup ARG NODE_VERSION From a1458b136bc6577561787481ea0cedc824d8c607 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 26 Feb 2024 10:57:25 +0100 Subject: [PATCH 100/100] New release v1.11.36-sc.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 7252cf8..fb2931e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 7252cf854ba614f7df7cbd20f8fa163316a6eb33 +Subproject commit fb2931eb808d99995a4cd5ef168e8d4697f39e3f diff --git a/element-web b/element-web index e625706..904c637 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit e6257065c1164f7e786d412050945626d834faac +Subproject commit 904c6378682d314fe91bf536b6207c6d5e320459 diff --git a/matrix-react-sdk b/matrix-react-sdk index 7aca4ab..5a1c347 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 7aca4ab6c0a0ab96382eeb4fe3470698f31b4d44 +Subproject commit 5a1c34750acf0c8da2a8ba25b6f79e9ac115230e