Skip to content

Commit 98773df

Browse files
committed
Get rid of dependence on usercontent.riot.im
1 parent 54f7347 commit 98773df

6 files changed

Lines changed: 77 additions & 12 deletions

File tree

.modernizr.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"feature-detects": [
88
"test/css/displaytable",
99
"test/css/flexbox",
10-
"test/es5/specification",
1110
"test/css/objectfit",
1211
"test/storage/localstorage",
1312
"test/es6/array",
@@ -18,6 +17,7 @@
1817
"test/svg/filters",
1918
"test/css/animations",
2019
"test/css/filters",
21-
"test/network/fetch"
20+
"test/network/fetch",
21+
"test/iframe/sandbox"
2222
]
2323
}

docs/config.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ For a good example, see https://riot.im/develop/config.json.
5757
1. `update_base_url` (electron app only): HTTPS URL to a web server to download
5858
updates from. This should be the path to the directory containing `macos`
5959
and `win32` (for update packages, not installer packages).
60-
1. `cross_origin_renderer_url`: URL to a static HTML page hosting code to help display
61-
encrypted file attachments. This MUST be hosted on a completely separate domain to
62-
anything else since it is used to isolate the privileges of file attachments to this
63-
domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
64-
https://github.com/matrix-org/usercontent/blob/master/v1.html
6560
1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config
6661
option out of your config file. If you want to enable analytics, set `piwik` to be an object
6762
containing the following properties:
@@ -87,7 +82,7 @@ For a good example, see https://riot.im/develop/config.json.
8782
default homeserver when signing up or logging in.
8883
1. `permalinkPrefix`: Used to change the URL that Riot generates permalinks with.
8984
By default, this is "https://matrix.to" to generate matrix.to (spec) permalinks.
90-
Set this to your Riot instance URL if you run an unfederated server (eg:
85+
Set this to your Riot instance URL if you run an unfederated server (eg:
9186
"https://riot.example.org").
9287

9388
Note that `index.html` also has an og:image meta tag that is set to an image

0 commit comments

Comments
 (0)