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 01/33] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 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 02/33] 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 03/33] 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 04/33] 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 05/33] 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 06/33] 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 07/33] 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 08/33] 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 09/33] 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 10/33] 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 11/33] 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 12/33] 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 13/33] 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 14/33] 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 15/33] 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 16/33] 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 17/33] 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 18/33] 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 19/33] 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 20/33] 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 21/33] 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 22/33] 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 23/33] =?UTF-8?q?Meh,=20flathub=20seems=20to=20require=20P?= =?UTF-8?q?Rs=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 24/33] 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 25/33] 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 26/33] 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 27/33] 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 28/33] 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 29/33] 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 30/33] 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 31/33] 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 32/33] 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 33/33] 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