Merge remote-tracking branch 'origin/develop' into element

Remove redundant enum

config.sample.json

@@ -27,7 +27,6 @@
     "showLabsSettings": false,
     "features": {
         "feature_new_spinner": "labs",
-        "feature_font_scaling": "labs",
         "feature_pinning": "labs",
         "feature_custom_status": "labs",
         "feature_custom_tags": "labs",

docs/labs.md

@@ -11,11 +11,6 @@ dropped. Ask in the room if you are unclear about any details here.**
 
 Replaces the old spinner image with a new, svg-based one featuring a sleeker design.
 
-## Font scaling (`feature_font_scaling`)
-
-Enables font scaling options for accessibility. To alter the scale check the
-appearance tab in settings.
-
 ## Message pinning (`feature_pinning`)
 
 Allows you to pin messages in the room. To pin a message, use the 3 dots to the right of the message

element.io/develop/config.json

@@ -14,7 +14,6 @@
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "features": {
         "feature_new_spinner": "labs",
-        "feature_font_scaling": "labs",
         "feature_pinning": "labs",
         "feature_custom_status": "labs",
         "feature_custom_tags": "labs",

src/components/views/auth/VectorAuthPage.js

@@ -28,7 +28,7 @@ export default class VectorAuthPage extends React.PureComponent {
         if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl;
 
         const brandingConfig = SdkConfig.get().branding;
-        VectorAuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/valley.jpg";
+        VectorAuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/lake.jpg";
         if (brandingConfig && brandingConfig.welcomeBackgroundUrl) {
             if (Array.isArray(brandingConfig.welcomeBackgroundUrl)) {
                 const index = Math.floor(Math.random() * brandingConfig.welcomeBackgroundUrl.length);

src/vector/platform/VectorBasePlatform.ts

@@ -23,14 +23,6 @@ import {getVectorConfig} from "../getconfig";
 
 import Favicon from "../../favicon";
 
-export const updateCheckStatusEnum = {
-    CHECKING: 'CHECKING',
-    ERROR: 'ERROR',
-    NOTAVAILABLE: 'NOTAVAILABLE',
-    DOWNLOADING: 'DOWNLOADING',
-    READY: 'READY',
-};
-
 /**
  * Vector-specific extensions to the BasePlatform template
  */

src/vector/platform/WebPlatform.ts

@@ -173,21 +173,18 @@ export default class WebPlatform extends VectorBasePlatform {
     }
 
     getDefaultDeviceDisplayName(): string {
-        // TODO: Revert this after launch
-        // // strip query-string and fragment from uri
-        // const u = url.parse(window.location.href);
-        // u.protocol = "";
-        // u.search = "";
-        // u.hash = "";
-        // // Remove trailing slash if present
-        // u.pathname = u.pathname.replace(/\/$/, "");
+        // strip query-string and fragment from uri
+        const u = url.parse(window.location.href);
+        u.protocol = "";
+        u.search = "";
+        u.hash = "";
+        // Remove trailing slash if present
+        u.pathname = u.pathname.replace(/\/$/, "");
 
-        // let appName = u.format();
-        // // Remove leading slashes if present
-        // appName = appName.replace(/^\/\//, "");
-        // // `appName` is now in the format `develop.element.io`.
-
-        const appName = "Riot Web";
+        let appName = u.format();
+        // Remove leading slashes if present
+        appName = appName.replace(/^\/\//, "");
+        // `appName` is now in the format `develop.element.io`.
 
         const ua = new UAParser();
         const browserName = ua.getBrowser().name || "unknown browser";