From b0c877040dc69827b352922fff0d4d5658d32315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jul 2022 16:03:20 +0200 Subject: [PATCH 1/8] Fix --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 4322149..175f06f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.10.15/element-v1.10.15.tar.gz -SOURCE_SUM=a2c39b9cdb36ac3f4d028bf83edd4091cd54b27df73a91040ae99886ddbfd416 +SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.11.0/element-v1.11.0.tar.gz +SOURCE_SUM=03919ddbec5475f5fe5994099630d0b91dd7999884ee4de408129fd15a9e9f51 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 11bb6f6..c16477f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web client for Matrix", "fr": "Client web pour Matrix" }, - "version": "1.10.15~ynh1", + "version": "1.11.0~ynh1", "url": "https://element.io", "upstream": { "license": "Apache-2.0", From 2f48d7f2d93a156f5a92f2983edaeb711cacc46f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 5 Jul 2022 14:03:27 +0000 Subject: [PATCH 2/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d93328d..576c8d2 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Element is a new type of messaging app. You choose where your messages are stored, putting you in control of your data. It gives you access to the Matrix open network, so you can talk to anyone. Element provides a new level of security, adding cross-signed device verification to default end-to-end encryption. -**Shipped version:** 1.10.15~ynh1 +**Shipped version:** 1.11.0~ynh1 **Demo:** https://app.element.io/ diff --git a/README_fr.md b/README_fr.md index 9d76011..e9783ef 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Element est un nouveau type d'application de messagerie. Vous choisissez où vos messages sont stockés, ce qui vous donne le contrôle de vos données. Il vous donne accès au réseau ouvert Matrix, vous pouvez donc parler à n'importe qui. Element offre un nouveau niveau de sécurité, en ajoutant la vérification des appareils par signature croisée au chiffrement de bout en bout par défaut. -**Version incluse :** 1.10.15~ynh1 +**Version incluse :** 1.11.0~ynh1 **Démo :** https://app.element.io/ From 8929436192264371387845da41a8f7f86e2914ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jul 2022 16:03:39 +0200 Subject: [PATCH 3/8] Revert "Fix" This reverts commit b0c877040dc69827b352922fff0d4d5658d32315. --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 175f06f..4322149 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.11.0/element-v1.11.0.tar.gz -SOURCE_SUM=03919ddbec5475f5fe5994099630d0b91dd7999884ee4de408129fd15a9e9f51 +SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.10.15/element-v1.10.15.tar.gz +SOURCE_SUM=a2c39b9cdb36ac3f4d028bf83edd4091cd54b27df73a91040ae99886ddbfd416 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c16477f..11bb6f6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web client for Matrix", "fr": "Client web pour Matrix" }, - "version": "1.11.0~ynh1", + "version": "1.10.15~ynh1", "url": "https://element.io", "upstream": { "license": "Apache-2.0", From a087f52fb63ab4de03930038ec3f20b6e4546522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jul 2022 16:05:12 +0200 Subject: [PATCH 4/8] 1.11.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 4322149..175f06f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.10.15/element-v1.10.15.tar.gz -SOURCE_SUM=a2c39b9cdb36ac3f4d028bf83edd4091cd54b27df73a91040ae99886ddbfd416 +SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.11.0/element-v1.11.0.tar.gz +SOURCE_SUM=03919ddbec5475f5fe5994099630d0b91dd7999884ee4de408129fd15a9e9f51 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 11bb6f6..c16477f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web client for Matrix", "fr": "Client web pour Matrix" }, - "version": "1.10.15~ynh1", + "version": "1.11.0~ynh1", "url": "https://element.io", "upstream": { "license": "Apache-2.0", From 2a0cddec8ad21a75b011aad45322c30491e4ac85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jul 2022 17:29:48 +0200 Subject: [PATCH 5/8] Fix config --- conf/config.json | 5 ++++- config_panel.toml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/conf/config.json b/conf/config.json index 7a5b772..913a49a 100644 --- a/conf/config.json +++ b/conf/config.json @@ -1,5 +1,8 @@ { - "default_server_name": "__DEFAULT_HOME_SERVER__", + "default_server_config": { + "m.homeserver": { "base_url": "https://__DEFAULT_HOME_SERVER__" }, + "m.identity_server": {"base_url": "https://vector.im"} + }, "brand": "Element", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", diff --git a/config_panel.toml b/config_panel.toml index 577ee16..544088f 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -11,4 +11,4 @@ name = "Element configuration" type = "string" default = "matrix.org" help = "Choose your default Matrix server's domain name. Default is matrix.org" - bind = "default_server_name:__FINALPATH__/config.json" + bind = "m.homeserver:__FINALPATH__/config.json" From 2a541ab866ad7d691c2f0287c9ead001a41656fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 6 Jul 2022 11:36:34 +0200 Subject: [PATCH 6/8] desactivate config panel --- config_panel.toml => config_panel.toml.example | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename config_panel.toml => config_panel.toml.example (85%) diff --git a/config_panel.toml b/config_panel.toml.example similarity index 85% rename from config_panel.toml rename to config_panel.toml.example index 544088f..91d483a 100644 --- a/config_panel.toml +++ b/config_panel.toml.example @@ -9,6 +9,5 @@ name = "Element configuration" [main.config.default_home_server] ask = "Choose a home server" type = "string" - default = "matrix.org" - help = "Choose your default Matrix server's domain name. Default is matrix.org" + help = "Choose your default Matrix server's domain name. Default is https://matrix.org" bind = "m.homeserver:__FINALPATH__/config.json" From 98ef085ad02ca1f8fb0eefc9cde269e45c35462a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 12 Jul 2022 15:21:59 +0200 Subject: [PATCH 7/8] fix default home_server --- config_panel.toml.example | 13 ------------- scripts/upgrade | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 config_panel.toml.example diff --git a/config_panel.toml.example b/config_panel.toml.example deleted file mode 100644 index 91d483a..0000000 --- a/config_panel.toml.example +++ /dev/null @@ -1,13 +0,0 @@ -version = "1.0" - -[main] -name = "Element configuration" - - [main.config] - name = "Server Configuration" - - [main.config.default_home_server] - ask = "Choose a home server" - type = "string" - help = "Choose your default Matrix server's domain name. Default is https://matrix.org" - bind = "m.homeserver:__FINALPATH__/config.json" diff --git a/scripts/upgrade b/scripts/upgrade index ba4ec4c..2091033 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,7 +48,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If default_home_server doesn't exist, create it if [ -z "$default_home_server" ]; then - default_home_server="https://matrix-client.matrix.org" + default_home_server="https://matrix.org" ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server fi From 24d2ead4d29b02f37354c36f036dd5cbbff137e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 12 Jul 2022 17:02:24 +0200 Subject: [PATCH 8/8] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2091033..2d4a6b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,7 +48,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If default_home_server doesn't exist, create it if [ -z "$default_home_server" ]; then - default_home_server="https://matrix.org" + default_home_server="matrix.org" ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server fi