configs/sc/config.json

@@ -1,11 +1,6 @@
 {
     "update_base_url": null,
-    "default_server_config": {
+    "default_server_name": "matrix.org",
-        "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",
@@ -19,10 +14,7 @@
     "showLabsSettings": true,
     "roomDirectory": {
         "servers": [
-            "matrix.org",
+            "matrix.org"
-            "gitter.im",
-            "libera.chat",
-            "schildi.chat"
         ]
     },
     "enable_presence_by_hs_url": {

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 dd74e3628176f0ad39097325e5603fec51408a83
+Subproject commit 4912004b86dc44cb49e7afcbae64a54fe57f38c6

element-web

@@ -1 +1 @@
-Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d
+Subproject commit 2abfc19777acff294a8f2895a9daef65163e7c2c

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636
+Subproject commit 679ba691ef8bbca0d3518411523c017e2ad8cdf9

matrix-react-sdk

@@ -1 +1 @@
-Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e
+Subproject commit eb43745d74433927e367d8efdc7ad0735b6a28b1