From be90badc8dff9d452a631fd9da83bee1bb1a1e5d Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Thu, 17 Nov 2016 11:36:46 +0000 Subject: [PATCH 1/5] Add css for the iframes for e2e attachments --- .../matrix-react-sdk/views/messages/MImageBody.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css b/src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css index 1134f2f6f..003ef1030 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css +++ b/src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css @@ -44,3 +44,17 @@ limitations under the License. vertical-align: middle; pointer-events: none; } + +/* Remove the border and padding for iframes for download links. */ +.mx_MImageBody_download iframe { + margin: 0px; + padding: 0px; + border: none; + width: 100%; + /* Set the height of the iframe to be 1 line of text. + * Iframes don't automatically size themselves to fit their content. + * So either we have to fix the height of the iframe using CSS or + * use javascript's cross-origin postMessage API to communicate how + * big the content of the iframe is. */ + height: 1.5em; +} From 6a944d3e7dca1c7c7c99ac9cce67bbb77254cfc9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 30 Nov 2016 18:09:51 +0000 Subject: [PATCH 2/5] Fix config location in some more places --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9d1fb48c0..0bbac7a55 100644 --- a/README.md +++ b/README.md @@ -59,16 +59,16 @@ to build. web server. Note that `npm run dist` is not supported on Windows, so Windows users can run `npm -run build`, which will build all the necessary files into the `vector` -directory. The version of Vector will not appear in Settings without -using the dist script. You can then mount the vector directory on your +run build`, which will build all the necessary files into the `webapp` +directory. The version of Riot will not appear in Settings without +using the dist script. You can then mount the `webapp` directory on your webserver to actually serve up the app, which is entirely static content. config.json =========== -You can configure the app by copying `vector/config.sample.json` to -`vector/config.json` and customising it: +You can configure the app by copying `config.sample.json` to +`config.json` and customising it: 1. `default_hs_url` is the default home server url. 1. `default_is_url` is the default identity server url (this is the server used From d0c2ab4cf10ef3700c69540467122174c6cfbcaa Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 2 Dec 2016 13:43:41 +0000 Subject: [PATCH 3/5] Document cross_origin_renderer_url --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 0bbac7a55..20812add2 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 4/5] 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 20812add2..5df8b4332 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 ======================== From 6ff253d0d86ec1b0f2158bd3d35f4ac490e2640c Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 2 Dec 2016 14:27:34 +0000 Subject: [PATCH 5/5] Empty commit to test Jenkins