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

electron/src/electron-main.js

@@ -156,8 +156,12 @@ electron.app.on('ready', () => {
         console.log("No update_base_url is defined: auto update is disabled");
     }
 
+    const icon_path = `${__dirname}/../img/riot.` + (
+        process.platform == 'win32' ? 'ico' : 'png'
+    );
+
     mainWindow = new electron.BrowserWindow({
-        icon: `${__dirname}/../img/riot.ico`,
+        icon: icon_path,
         width: 1024, height: 768,
         show: false,
     });

scripts/redeploy.py

@@ -127,7 +127,7 @@ def on_receive_jenkins_poke():
 if __name__ == "__main__":
     parser = argparse.ArgumentParser("Runs a Vector redeployment server.")
     parser.add_argument(
-        "-j", "--jenkins", dest="jenkins", default="http://matrix.org/jenkins/", help=(
+        "-j", "--jenkins", dest="jenkins", default="https://matrix.org/jenkins/", help=(
             "The base URL of the Jenkins web server. This will be hit to get the\
             built artifacts (the .gz file) for redeploying."
         )

src/vector/platform/ElectronPlatform.js

@@ -52,7 +52,7 @@ function platformFriendlyName() {
             // Sorry, Linux users: you get lumped into here,
             // but only because Linux's capitalisation is
             // normal. We do care about you.
-            return window.process.platform[0].toUpperCase + window.process.platform.slice(1);
+            return window.process.platform[0].toUpperCase() + window.process.platform.slice(1);
     }
 }