From d0c2ab4cf10ef3700c69540467122174c6cfbcaa Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 2 Dec 2016 13:43:41 +0000 Subject: [PATCH 1/2] Document cross_origin_renderer_url --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 0bbac7a55c..20812add2a 100644 --- a/README.md +++ b/README.md @@ -107,6 +107,15 @@ You can configure the app by copying `config.sample.json` to valid location on this network. This is used as a hint to the user to indicate when a valid location has been entered so it's not necessary for this to be exactly correct. Optional. +1. `cross_origin_renderer_url`: URL to a static HTML page hosting code to help display + encrypted file attachments. This MUST be hosted on a completely separate domain to + anything else since it is used to isolate the privileges of file attachments to this + domain. Default: `usercontent.riot.im`. The HTML this page needs to contain is: + ``` + + ``` Running as a Desktop app ======================== From 749d26c8f4a773c5dcb2ee6d4f9f99632327cd9f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 2 Dec 2016 14:25:20 +0000 Subject: [PATCH 2/2] Link to the repo which it turns out is a thing --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 20812add2a..5df8b4332b 100644 --- a/README.md +++ b/README.md @@ -110,12 +110,8 @@ You can configure the app by copying `config.sample.json` to 1. `cross_origin_renderer_url`: URL to a static HTML page hosting code to help display encrypted file attachments. This MUST be hosted on a completely separate domain to anything else since it is used to isolate the privileges of file attachments to this - domain. Default: `usercontent.riot.im`. The HTML this page needs to contain is: - ``` - - ``` + domain. Default: `usercontent.riot.im`. This needs to contain v1.html from + https://github.com/matrix-org/usercontent/blob/master/v1.html Running as a Desktop app ========================