From e737fccd5a33318e2918f1ca58d521bf5f3d338e Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 13 Jul 2020 18:34:46 +0100 Subject: [PATCH 1/2] Move app config files to new name --- {riot.im => element.io}/README | 9 +++++---- {riot.im => element.io}/app/config.json | 0 {riot.im => element.io}/app/deploy.py | 0 {riot.im => element.io}/develop/config.json | 0 4 files changed, 5 insertions(+), 4 deletions(-) rename {riot.im => element.io}/README (51%) rename {riot.im => element.io}/app/config.json (100%) rename {riot.im => element.io}/app/deploy.py (100%) rename {riot.im => element.io}/develop/config.json (100%) diff --git a/riot.im/README b/element.io/README similarity index 51% rename from riot.im/README rename to element.io/README index ba9b17d313..ee3f1cda8a 100644 --- a/riot.im/README +++ b/element.io/README @@ -1,11 +1,12 @@ This directory contains the config files and deployment scripts for the official -riot.im distribution of Riot Web at https://riot.im. +element.io distribution of Element Web. You probably do not want to build with this config unless you're building the -official riot.im distribution, but these files may be useful if you want to +official element.io distribution, but these files may be useful if you want to inspect the configuration used there. -Riot Desktop uses a separate config (see https://github.com/vector-im/riot-desktop/tree/develop/riot.im). +Element Desktop uses a separate config (see +https://github.com/vector-im/riot-desktop/tree/develop/element.io). Deployment scripts (such as app/deploy.py) are meant to be run on the web server -hosting the Riot installation. +hosting the Element installation. diff --git a/riot.im/app/config.json b/element.io/app/config.json similarity index 100% rename from riot.im/app/config.json rename to element.io/app/config.json diff --git a/riot.im/app/deploy.py b/element.io/app/deploy.py similarity index 100% rename from riot.im/app/deploy.py rename to element.io/app/deploy.py diff --git a/riot.im/develop/config.json b/element.io/develop/config.json similarity index 100% rename from riot.im/develop/config.json rename to element.io/develop/config.json From e3e2bd1e7b4ddb1cde4864a2ec798d5b087793a2 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 13 Jul 2020 18:43:02 +0100 Subject: [PATCH 2/2] Update brand to new name --- element.io/app/config.json | 2 +- element.io/develop/config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element.io/app/config.json b/element.io/app/config.json index 11fd7341a1..30d4a2e44d 100644 --- a/element.io/app/config.json +++ b/element.io/app/config.json @@ -1,6 +1,6 @@ { "default_server_name": "matrix.org", - "brand": "Riot", + "brand": "Element", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", "integrations_widgets_urls": [ diff --git a/element.io/develop/config.json b/element.io/develop/config.json index 553641cdd8..c0eda43e8e 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -1,6 +1,6 @@ { "default_server_name": "matrix.org", - "brand": "Riot", + "brand": "Element", "integrations_ui_url": "https://scalar-staging.vector.im/", "integrations_rest_url": "https://scalar-staging.vector.im/api", "integrations_widgets_urls": [