From 05ff60b4c3445623b1b902f4e8c9ad6359848da6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 19:02:18 +0200 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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