From a8a9e2ac41bcf50a0fd1d9fdfd402b6930ac098c Mon Sep 17 00:00:00 2001 From: Julien DAUPHANT <1238254+jdauphant@users.noreply.github.com> Date: Sat, 7 May 2022 15:07:33 +0200 Subject: [PATCH 1/3] Improve configuration --- config.dev.json | 17 ++++++----------- config.preprod.json | 17 ++++++----------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/config.dev.json b/config.dev.json index 52b4df99b1..fd00059fe4 100644 --- a/config.dev.json +++ b/config.dev.json @@ -30,16 +30,7 @@ "disable_login_language_selector": false, "disable_3pid_login": true, "brand": "Tchap", - "integrations_ui_url": "https://scalar.vector.im/", - "integrations_rest_url": "https://scalar.vector.im/api", - "integrations_widgets_urls": [ - "https://scalar.vector.im/_matrix/integrations/v1", - "https://scalar.vector.im/api", - "https://scalar-staging.vector.im/_matrix/integrations/v1", - "https://scalar-staging.vector.im/api", - "https://scalar-staging.riot.im/scalar/api" - ], - "bug_report_endpoint_url": "https://element.io/bugreports/submit", + "bug_report_endpoint_url": "/bugreports/submit", "uisi_autorageshake_app": "element-auto-uisi", "defaultCountryCode": "FR", "showLabsSettings": false, @@ -64,6 +55,10 @@ "UIFeature.voip": false, "UIFeature.shareSocial": false, "UIFeature.registration": false, + "UIFeature.urlPreviews" : false, + "UIFeature.widgets" : false, + "UIFeature.communities" : false, + "UIFeature.shareQrCode" : false, "layout": "bubble", "custom_themes": [ { @@ -96,7 +91,7 @@ "authFooterLinks": [] }, "jitsi": { - "preferredDomain": "meet.element.io" + "preferredDomain": "webconf.numerique.gouv.fr" }, "desktopBuilds": { "available": false diff --git a/config.preprod.json b/config.preprod.json index 453ee31b86..01c625adb5 100644 --- a/config.preprod.json +++ b/config.preprod.json @@ -25,16 +25,7 @@ "disable_login_language_selector": false, "disable_3pid_login": true, "brand": "Tchap", - "integrations_ui_url": "https://scalar.vector.im/", - "integrations_rest_url": "https://scalar.vector.im/api", - "integrations_widgets_urls": [ - "https://scalar.vector.im/_matrix/integrations/v1", - "https://scalar.vector.im/api", - "https://scalar-staging.vector.im/_matrix/integrations/v1", - "https://scalar-staging.vector.im/api", - "https://scalar-staging.riot.im/scalar/api" - ], - "bug_report_endpoint_url": "https://element.io/bugreports/submit", + "bug_report_endpoint_url": "/bugreports/submit", "uisi_autorageshake_app": "element-auto-uisi", "defaultCountryCode": "FR", "showLabsSettings": false, @@ -58,6 +49,10 @@ "UIFeature.voip": false, "UIFeature.shareSocial": false, "UIFeature.registration": false, + "UIFeature.urlPreviews" : false, + "UIFeature.widgets" : false, + "UIFeature.communities" : false, + "UIFeature.shareQrCode" : false, "layout": "bubble", "custom_themes": [ { @@ -90,7 +85,7 @@ "authFooterLinks": [] }, "jitsi": { - "preferredDomain": "meet.element.io" + "preferredDomain": "webconf.numerique.gouv.fr" }, "desktopBuilds": { "available": false From 0c55afb74df79156e45f289c0ce71ebef74f818a Mon Sep 17 00:00:00 2001 From: Julien DAUPHANT <1238254+jdauphant@users.noreply.github.com> Date: Tue, 28 Jun 2022 00:41:54 +0200 Subject: [PATCH 2/3] Apply suggestions from code review --- config.dev.json | 1 - config.preprod.json | 1 - 2 files changed, 2 deletions(-) diff --git a/config.dev.json b/config.dev.json index fd00059fe4..970b856c3f 100644 --- a/config.dev.json +++ b/config.dev.json @@ -57,7 +57,6 @@ "UIFeature.registration": false, "UIFeature.urlPreviews" : false, "UIFeature.widgets" : false, - "UIFeature.communities" : false, "UIFeature.shareQrCode" : false, "layout": "bubble", "custom_themes": [ diff --git a/config.preprod.json b/config.preprod.json index 01c625adb5..21f06ccdda 100644 --- a/config.preprod.json +++ b/config.preprod.json @@ -51,7 +51,6 @@ "UIFeature.registration": false, "UIFeature.urlPreviews" : false, "UIFeature.widgets" : false, - "UIFeature.communities" : false, "UIFeature.shareQrCode" : false, "layout": "bubble", "custom_themes": [ From 342589501b1de6e977958b5995e76bcbf659ecd5 Mon Sep 17 00:00:00 2001 From: Julien DAUPHANT <1238254+jdauphant@users.noreply.github.com> Date: Tue, 28 Jun 2022 00:43:44 +0200 Subject: [PATCH 3/3] Update config.prod.json --- config.prod.json | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/config.prod.json b/config.prod.json index ee1c82de4e..1355da731c 100644 --- a/config.prod.json +++ b/config.prod.json @@ -95,16 +95,7 @@ "disable_login_language_selector": false, "disable_3pid_login": true, "brand": "Tchap", - "integrations_ui_url": "https://scalar.vector.im/", - "integrations_rest_url": "https://scalar.vector.im/api", - "integrations_widgets_urls": [ - "https://scalar.vector.im/_matrix/integrations/v1", - "https://scalar.vector.im/api", - "https://scalar-staging.vector.im/_matrix/integrations/v1", - "https://scalar-staging.vector.im/api", - "https://scalar-staging.riot.im/scalar/api" - ], - "bug_report_endpoint_url": "https://element.io/bugreports/submit", + "bug_report_endpoint_url": "/bugreports/submit", "uisi_autorageshake_app": "element-auto-uisi", "defaultCountryCode": "FR", "showLabsSettings": false, @@ -142,6 +133,9 @@ "UIFeature.voip": false, "UIFeature.shareSocial": false, "UIFeature.registration": false, + "UIFeature.urlPreviews" : false, + "UIFeature.widgets" : false, + "UIFeature.shareQrCode" : false, "layout": "bubble", "custom_themes": [ { @@ -174,7 +168,7 @@ "authFooterLinks": [] }, "jitsi": { - "preferredDomain": "meet.element.io" + "preferredDomain": "webconf.numerique.gouv.fr" }, "desktopBuilds": { "available": false