Merge remote-tracking branch 'origin/develop' into release-v0.9.8

src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss

@@ -133,9 +133,10 @@ limitations under the License.
 .mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody {
     display: block;
     width: 100%;
-    height: 73px;
+    height: 36px;
     background-image: $event-redacted-img;
     background-repeat: no-repeat;
+    background-size: contain;
 }
 
 .mx_EventTile.mx_EventTile_redacted .mx_EventTile_line {

src/vector/platform/ElectronPlatform.js

@@ -139,4 +139,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
     requestNotificationPermission() : Promise {
         return q('granted');
     }
+
+    reload() {
+        electron.remote.getCurrentWebContents().reload();
+    }
 }

src/vector/platform/WebPlatform.js

@@ -206,4 +206,10 @@ export default class WebPlatform extends VectorBasePlatform {
         }
         return null;
     }
+
+    reload() {
+        // forceReload=false since we don't really need new HTML/JS files
+        // we just need to restart the JS runtime.
+        window.location.reload(false);
+    }
 }