gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
David Baker 2016-12-07 17:18:15 +00:00
parent a9fcf106ab 2b51cda6da
commit 98f9e2f870
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electron/src/electron-main.js
View File

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

2
scripts/redeploy.py
View File

@ -127,7 +127,7 @@ def on_receive_jenkins_poke():
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser("Runs a Vector redeployment server.") parser = argparse.ArgumentParser("Runs a Vector redeployment server.")
parser.add_argument( 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\ "The base URL of the Jenkins web server. This will be hit to get the\
built artifacts (the .gz file) for redeploying." built artifacts (the .gz file) for redeploying."
) )

2
src/vector/platform/ElectronPlatform.js
View File

@ -52,7 +52,7 @@ function platformFriendlyName() {
// Sorry, Linux users: you get lumped into here, // Sorry, Linux users: you get lumped into here,
// but only because Linux's capitalisation is // but only because Linux's capitalisation is
// normal. We do care about you. // 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);
} }
} }