New release v1.9.8-sc.1

Always run setup to get yarn links in place (again)
New test release v1.9.8-sc.0.test.3
2021-12-31 03:48:23 +01:00 · 2021-12-30 01:20:07 +01:00 · 2021-12-30 00:39:29 +01:00 · 2021-12-30 00:39:06 +01:00 · 2021-12-27 22:35:40 +01:00 · 2021-12-27 22:30:13 +01:00
11 changed files with 26 additions and 18 deletions
--- a/2
+++ b/2
@ -43,7 +43,7 @@ CSC_NAME ?=
 -include release.mk

 setup:
-	if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi
+	./setup.sh

 element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset/*)

--- a/bump_release_version.sh
+++ b/bump_release_version.sh
@ -17,4 +17,12 @@ forall_repos check_clean_git

 bump_release_version

+# Get version string
+get_current_versions
+get_versions_string
+
+# Add everything
+git add -A
+git commit --allow-empty -m "New release v$versions_string"
+
 popd > /dev/null
--- a/bump_test_version.sh
+++ b/bump_test_version.sh
@ -17,4 +17,12 @@ forall_repos check_clean_git

 bump_test_version

+# Get version string
+get_current_versions
+get_versions_string
+
+# Add everything
+git add -A
+git commit --allow-empty -m "New test release v$versions_string"
+
 popd > /dev/null
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@ -26,12 +26,5 @@
            "url": "https://schildi.chat/desktop/privacy",
            "text": "Privacy Policy"
        }
-    ],
-    "sc_update_announcement_room": {
-        "room_id_or_alias": "!JwTYjASnrfLEJQGQvt:matrix.org",
-        "via_servers": [
-            "supercable.onl",
-            "spiritcroc.de"
-        ]
-    }
+    ]
 }
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit a074ede0c13c09dca96a9be2c60d3c4e5c03a234
+Subproject commit 15cd24dfc336421f3f4ec1a1ac2d886732b302b8
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 94895dee0a29a517919b8ba7461982baf11139cc
+Subproject commit 661bfae1a8c9b4c97e6e6f7ce68a3b3d6bf65d91
--- a/i18n-overlays/element-desktop/fa.json
+++ b/i18n-overlays/element-desktop/fa.json
@ -1 +1,3 @@
-{}
+{
+    "Show": "نشان دادن"
+}
--- a/local-pkgbuild-template/schildichat-desktop.sh
+++ b/local-pkgbuild-template/schildichat-desktop.sh
@ -1,3 +1,3 @@
 #!/bin/sh

-exec "/opt/---productName---/---appName---" "$@"
+LD_PRELOAD=/usr/lib/libsqlcipher.so exec "/opt/---productName---/---appName---" "$@"
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 09fc7b8ff4035e92821d264e807441f9d4e9da85
+Subproject commit a71dd32356c5fd11000f3344370a4e25594e7f6d
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 2fd5a9616e11a138d859e0a30e81e5d9d185f77f
+Subproject commit 7edaf5bc5204fbf658057fd272e17e2ebeb207f9
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@ -238,9 +238,6 @@ automatic_packagejson_reversion() {
 automatic_packagejson_adjustment() {
    local versions
    get_current_versions
-    
-    # every build after a merge is a new test build
-    versions[2]=$((versions[2] + 1))

    forelement_repos apply_packagejson_overlay "package.json" "overlay-package.json"
    forelement_repos write_version "package.json"
Author	SHA1	Message	Date
su-ex	3c9487541b	New release v1.9.8-sc.1	2021-12-31 03:48:23 +01:00
su-ex	4a52399ec2	Always run setup to get yarn links in place (again)	2021-12-30 01:20:07 +01:00
su-ex	c27c617d14	New test release v1.9.8-sc.0.test.3	2021-12-30 00:39:29 +01:00
su-ex	764f0767c7	sc update announcement room toast now uses hardcoded alias	2021-12-30 00:39:06 +01:00
su-ex	fd8bca4d20	Try Element nightly AUR search in encrypted rooms fix https://aur.archlinux.org/cgit/aur.git/commit/?h=element-desktop-nightly-bin&id=ca89fc1f025d30512c53abbe87cff61c7739c69b	2021-12-27 22:35:40 +01:00
su-ex	52bfca57fb	New test release v1.9.8-sc.0.test.2	2021-12-27 22:30:13 +01:00
su-ex	5dfc140993	Let version bumps autocommit everything	2021-12-27 22:29:51 +01:00
su-ex	50dde2a683	Revert "Every build after a merge is a new test build" This reverts commit `31c746c5d2`.	2021-12-27 22:29:13 +01:00
Shahed Hosseini	8ada69cbcd	Translated using Weblate (Persian) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/fa/	2021-12-20 01:06:48 +01:00