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 undo_setup fixup
+.PHONY: clean
 
 CFGDIR ?= configs/sc
 
@@ -166,11 +166,3 @@ 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

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_16.x | bash -
+# curl -sL https://deb.nodesource.com/setup_14.x | bash -
 # apt update
 # apt install nodejs
 

deploy/update-flathub.sh

@@ -20,11 +20,8 @@ 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"
 
@@ -36,8 +33,8 @@ sed -i "s|^\s\s<releases>$|  <releases>\n    <release version=\"$version\" date=
 git add $yamlFile $xmlFile
 git commit -m "Bump version to v$version"
 
-git push -f --set-upstream origin "release-v$version"
+git push
 
 popd > /dev/null
 
-echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/"
+echo "Release v$version published on flathub!"

element-desktop

@@ -1 +1 @@
-Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00
+Subproject commit bb09b97684db6927539a57ac05356bb7b6dffad3

element-web

@@ -1 +1 @@
-Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b
+Subproject commit 2a51d277c7bc83b1b001d1aae50574bfb812d488

generate_changelog.sh

@@ -1,61 +0,0 @@
-#!/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 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
-
-    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

i18n-overlays/element-desktop/ja.json

@@ -1 +0,0 @@
-{}

i18n-overlays/element-web/ja.json

@@ -1 +0,0 @@
-{}

i18n-overlays/matrix-react-sdk/ja.json

@@ -1,3 +0,0 @@
-{
-    "Normal priority": "常優先度"
-}

i18n-overlays/matrix-react-sdk/lt.json

@@ -17,37 +17,5 @@
     "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.",
-    "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"
+    "All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje."
 }

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676
+Subproject commit c2deb2a20e687b1ef566a3e21ae3c5c18b473dd1

matrix-react-sdk

@@ -1 +1 @@
-Subproject commit c9fb6bbbb8bf97802277127601163618669acdee
+Subproject commit bf34169e576fde32cc9b0384eed22220b311ef39