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

package.json

@@ -138,7 +138,7 @@
   "build": {
     "appId": "im.riot.app",
     "category": "Network",
-    "electronVersion": "1.4.14",
+    "electronVersion": "1.6.2",
     "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
     "asar": false,
     "dereference": true,

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

@@ -133,10 +133,17 @@ limitations under the License.
 .mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody {
     display: block;
     width: 100%;
-    max-width: 300px;
+    height: 73px;
-    height: 24px;
+    background-image: $event-redacted-img;
-    border-radius: 4px;
+    background-repeat: no-repeat;
-    background-color: black;
+}
+
+.mx_EventTile.mx_EventTile_redacted .mx_EventTile_line {
+    /*
+       Prevent changing colour of the background because
+       $event-redacted-img matches $primary-bg-color
+    */
+    background-color: initial !important;
 }
 
 .mx_EventTile_highlight,

src/skins/vector/css/themes/_base.scss

@@ -93,6 +93,9 @@ $event-encrypting-color: #abddbc;
 $event-sending-color: #ddd;
 $event-notsent-color: #f44;
 
+// event redaction
+$event-redacted-img: url('../../img/redacted.jpg');
+
 // event timestamp
 $event-timestamp-color: #acacac;
 

src/skins/vector/css/themes/_dark.scss

@@ -93,6 +93,9 @@ $event-encrypting-color: rgba(171, 221, 188, 0.4);
 $event-sending-color: #888;
 $event-notsent-color: #f44;
 
+// event redaction
+$event-redacted-img: url('../../img/redacted-dark.jpg');
+
 // event timestamp
 $event-timestamp-color: #acacac;
 

src/vector/rageshake.js

@@ -488,6 +488,7 @@ module.exports = {
                     text: (
                         userText || "User did not supply any additional text."
                     ),
+                    app: 'riot-web',
                     version: version,
                     user_agent: userAgent,
                 },