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 1/3] 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 2/3] 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 3/3] 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"