From e6be1bb59d214ae53d463db29dbc7deb4b987a03 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 14 Oct 2022 09:22:55 +0200 Subject: [PATCH 1/9] Update config.json --- conf/config.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/config.json b/conf/config.json index 913a49a..50b969a 100644 --- a/conf/config.json +++ b/conf/config.json @@ -15,6 +15,8 @@ "enable_presence_by_hs_url": { "https://matrix.org": false, "https://matrix-client.matrix.org": false + }, + "embedded_pages": { + "login_for_welcome": true } } - From 1c820d587c60643fc1d72c51b40a048fa3fc0978 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 14 Oct 2022 18:32:35 +0200 Subject: [PATCH 2/9] Add config panel --- conf/config.json | 2 +- config_panel.toml | 16 ++++++++++++++++ scripts/install | 3 +++ scripts/upgrade | 7 +++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 config_panel.toml diff --git a/conf/config.json b/conf/config.json index 50b969a..f76fdf8 100644 --- a/conf/config.json +++ b/conf/config.json @@ -17,6 +17,6 @@ "https://matrix-client.matrix.org": false }, "embedded_pages": { - "login_for_welcome": true + "login_for_welcome": __LOGIN_FOR_WELCOME__ } } diff --git a/config_panel.toml b/config_panel.toml new file mode 100644 index 0000000..eb60310 --- /dev/null +++ b/config_panel.toml @@ -0,0 +1,16 @@ +version = "1.0" + +[main] +name = "Element configuration" +services = ["__APP__"] + + [main.config] + name = "Configuration Options" + + [main.config.login_for_welcome] + ask = "Display login as welcome page" + type = "boolean" + yes = "true" + no = "false" + help = "When true, the app will use the login form as a welcome page instead of the welcome page itself. This disables use of welcome_url and all welcome page functionality." + bind = "login_for_welcome:/var/www/__APP__/config.json" diff --git a/scripts/install b/scripts/install index 39c9aec..884772c 100644 --- a/scripts/install +++ b/scripts/install @@ -28,6 +28,8 @@ default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER app=$YNH_APP_INSTANCE_NAME +login_for_welcome="true" + #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= @@ -47,6 +49,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server +ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome #================================================= # CREATE DEDICATED USER diff --git a/scripts/upgrade b/scripts/upgrade index 2d4a6b8..a98f683 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,8 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) default_home_server=$(ynh_app_setting_get --app=$app --key=default_home_server) +login_for_welcome=$(ynh_app_setting_get --app=$app --key=login_for_welcome) + #================================================= # CHECK VERSION #================================================= @@ -52,6 +54,11 @@ if [ -z "$default_home_server" ]; then ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server fi +if [ -z "$login_for_welcome" ]; then + login_for_welcome="true" + ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome +fi + # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all From 5ccb14db9129548ddec625870cc4f4484b2a8f8d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 14 Oct 2022 18:35:11 +0200 Subject: [PATCH 3/9] Update config_panel.toml --- config_panel.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index eb60310..fb85c04 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -2,7 +2,6 @@ version = "1.0" [main] name = "Element configuration" -services = ["__APP__"] [main.config] name = "Configuration Options" From 4b6c9662ef7b3f20b19ff3dce814eecd05f133ab Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 14 Oct 2022 18:37:57 +0200 Subject: [PATCH 4/9] Fix --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 884772c..f0f8dc9 100644 --- a/scripts/install +++ b/scripts/install @@ -28,7 +28,7 @@ default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER app=$YNH_APP_INSTANCE_NAME -login_for_welcome="true" +login_for_welcome=true #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS diff --git a/scripts/upgrade b/scripts/upgrade index a98f683..c259066 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,7 +55,7 @@ if [ -z "$default_home_server" ]; then fi if [ -z "$login_for_welcome" ]; then - login_for_welcome="true" + login_for_welcome=true ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome fi From 67816e135bdd5eac6e670578912a6125f5dd9cf7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 14 Oct 2022 18:40:03 +0200 Subject: [PATCH 5/9] Update config_panel.toml --- config_panel.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index fb85c04..80cb82f 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -9,7 +9,7 @@ name = "Element configuration" [main.config.login_for_welcome] ask = "Display login as welcome page" type = "boolean" - yes = "true" - no = "false" + yes = true + no = false help = "When true, the app will use the login form as a welcome page instead of the welcome page itself. This disables use of welcome_url and all welcome page functionality." bind = "login_for_welcome:/var/www/__APP__/config.json" From 6381fcd08106d671b48fbc88d953eaec403cf5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 25 Oct 2022 19:19:02 +0200 Subject: [PATCH 6/9] 1.11.11 --- 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 3305c85..b0143f9 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.10/element-v1.11.10.tar.gz -SOURCE_SUM=153853fc3f1ad3f5da791834904b107d88bb71caf573eb52a2d81bf4a34f634a +SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.11.11/element-v1.11.11.tar.gz +SOURCE_SUM=24d443df7ed1679c86bea6e45f466805e533fc00cb13282c3213e8f111423aed SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 10f7f9a..0e52738 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web client for Matrix", "fr": "Client web pour Matrix" }, - "version": "1.11.10~ynh1", + "version": "1.11.11~ynh1", "url": "https://element.io", "upstream": { "license": "Apache-2.0", From 896fb9f1841c1907965d6e0fa2361ad5db886edc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 25 Oct 2022 17:19:08 +0000 Subject: [PATCH 7/9] 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 c886654..b97004a 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.11.10~ynh1 +**Shipped version:** 1.11.11~ynh1 **Demo:** https://app.element.io/ diff --git a/README_fr.md b/README_fr.md index 9a274fc..cd1769e 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.11.10~ynh1 +**Version incluse :** 1.11.11~ynh1 **Démo :** https://app.element.io/ From 1d81a74e60dcba66f952f19cb40701ee1a81136b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 26 Oct 2022 19:02:19 +0200 Subject: [PATCH 8/9] 1.11.12 --- 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 b0143f9..32a83db 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.11/element-v1.11.11.tar.gz -SOURCE_SUM=24d443df7ed1679c86bea6e45f466805e533fc00cb13282c3213e8f111423aed +SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.11.12/element-v1.11.12.tar.gz +SOURCE_SUM=62469002d03600c220de90b6f009f4b1016d2bdeb2255145c544f3144ddd1c84 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 0e52738..768e835 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web client for Matrix", "fr": "Client web pour Matrix" }, - "version": "1.11.11~ynh1", + "version": "1.11.12~ynh1", "url": "https://element.io", "upstream": { "license": "Apache-2.0", From 4fd62b8246cbde842d816a2d9770d03f92a8b16a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 26 Oct 2022 17:02:26 +0000 Subject: [PATCH 9/9] 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 b97004a..56841e6 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.11.11~ynh1 +**Shipped version:** 1.11.12~ynh1 **Demo:** https://app.element.io/ diff --git a/README_fr.md b/README_fr.md index cd1769e..58a3802 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.11.11~ynh1 +**Version incluse :** 1.11.12~ynh1 **Démo :** https://app.element.io/