gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2680 from vector-im/dbkr/document_cross_origin_renderer_url 

Document cross_origin_renderer_url
This commit is contained in:
David Baker 2016-12-02 14:31:45 +00:00 committed by GitHub
parent 6ff253d0d8 749d26c8f4
commit d5a5abe202
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -107,6 +107,11 @@ 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`. This needs to contain v1.html from
https://github.com/matrix-org/usercontent/blob/master/v1.html
Running as a Desktop app
========================