From ad79f67ab6d3b6cbea1605f9e123e017448cbf14 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Tue, 6 Dec 2016 17:59:17 -0500 Subject: [PATCH 1/3] Add missing brackets to call to toUpperCase --- src/vector/platform/ElectronPlatform.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index d6f4013a..3b41822b 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/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); } } From 737f912abb3567f7318439d2dc275aecb6caea74 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 7 Dec 2016 11:19:51 +0000 Subject: [PATCH 2/3] Use a PNG for the icon on non-Windows MATE desktop env (and presumably other GNOMEs don't support ICOs, so use a PNG. Fixes https://github.com/vector-im/riot-web/issues/2705 --- electron/src/electron-main.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/electron/src/electron-main.js b/electron/src/electron-main.js index 788d4602..2b135a03 100644 --- a/electron/src/electron-main.js +++ b/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, }); From 2b51cda6da95b93d47d536fcd86e2fa8f4d8719f Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 7 Dec 2016 14:07:31 +0000 Subject: [PATCH 3/3] talk to jenkins via https for the /dev redeployer --- scripts/redeploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/redeploy.py b/scripts/redeploy.py index 6e6e64aa..fddd5da9 100755 --- a/scripts/redeploy.py +++ b/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." )