Merge branch 'jryans/remove-brand' into 'element'

jryans · jryans · commit 8d0f57d62d18 · 2020-07-13T20:44:18.000Z
Move config files, update brand

See merge request new-vector/element/element-web/element-web!3
diff --git a/element.io/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/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/app/deploy.py b/element.io/app/deploy.py
diff --git 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": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"default_server_name": "matrix.org",`
`3`		`- "brand": "Riot",`
	`3`	`+ "brand": "Element",`
`4`	`4`	`"integrations_ui_url": "https://scalar.vector.im/",`
`5`	`5`	`"integrations_rest_url": "https://scalar.vector.im/api",`
`6`	`6`	`"integrations_widgets_urls": [`