Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

Merge develop into master #2279

Merged
merged 13 commits into from
May 23, 2017
Merged

Merge develop into master #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e7f291f
[electron-builder] fix 'node_modules' copy (#2196)
luclu May 3, 2017
9260ab6
Merge branch 'master' into develop
luclu May 3, 2017
11919d5
add windows code-signing (#2194)
luclu May 4, 2017
bebfe6d
[yarn] update solc 0.4.11 (#2203)
luclu May 4, 2017
36fbc4a
[travis] also upload wallet on release build (#2208)
luclu May 5, 2017
62c2c76
Merge branch 'develop' of https://github.com/ethereum/mist into develop
evertonfraga May 5, 2017
fd219a5
[travis] update github publish (#2218)
luclu May 8, 2017
7503362
Merge branch 'master' of https://github.com/ethereum/mist into develop
evertonfraga May 8, 2017
1af03ce
numeral.js: console.warn instead of console.error (#2154)
luclu May 9, 2017
c401c7c
Fixing backup typo
evertonfraga May 9, 2017
808a2cd
[travis] fix github uploader (github API behaviour changed) (#2240)
luclu May 11, 2017
d27a578
update geth 1.6.1 (#2277)
luclu May 18, 2017
2e362c9
[spectron] increase some timeouts for travis (#2282)
luclu May 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 52 additions & 28 deletions clientBinaries.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,91 +1,115 @@

{
"clients": {
"Geth": {
"version": "1.6.0",
"version": "1.6.1",
"platforms": {
"linux": {
"x64": {
"download": {
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.6.0-facc47cb.tar.gz",
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.6.1-021c3c28.tar.gz",
"type": "tar",
"md5": "048b0618696b040f6d3ff18ee2e5763a",
"bin": "geth-linux-amd64-1.6.0-facc47cb/geth"
"md5": "fdb7810fc6da33f4fb55bc4277751003",
"bin": "geth-linux-amd64-1.6.1-021c3c28/geth"
},
"bin": "geth",
"commands": {
"sanity": {
"args": ["version"],
"output": [ "Geth", "1.6.0" ]
"args": [
"version"
],
"output": [
"Geth",
"1.6.1"
]
}
}
},
"ia32": {
"download": {
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.6.0-facc47cb.tar.gz",
"url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.6.1-021c3c28.tar.gz",
"type": "tar",
"md5": "44215076b4d50e079878bcabeaae2117",
"bin": "geth-linux-386-1.6.0-facc47cb/geth"
"md5": "651c2ced8ed2817c83b537b3ae323711",
"bin": "geth-linux-386-1.6.1-021c3c28/geth"
},
"bin": "geth",
"commands": {
"sanity": {
"args": ["version"],
"output": [ "Geth", "1.6.0" ]
"args": [
"version"
],
"output": [
"Geth",
"1.6.1"
]
}
}
}
},
"mac": {
"x64": {
"download": {
"url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.6.0-facc47cb.tar.gz",
"url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.6.1-021c3c28.tar.gz",
"type": "tar",
"md5": "446308f1d702bf5d30892bda43c25d23",
"bin": "geth-darwin-amd64-1.6.0-facc47cb/geth"
"md5": "84d48160bf53c0d959486ac7c5b1542e",
"bin": "geth-darwin-amd64-1.6.1-021c3c28/geth"
},
"bin": "geth",
"commands": {
"sanity": {
"args": ["version"],
"output": [ "Geth", "1.6.0" ]
"args": [
"version"
],
"output": [
"Geth",
"1.6.1"
]
}
}
}
},
"win": {
"x64": {
"download": {
"url": "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.6.0-facc47cb.zip",
"url": "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.6.1-021c3c28.zip",
"type": "zip",
"md5": "e4bb82c4d7078269a932cb7d46c5acb4",
"bin": "geth-windows-amd64-1.6.0-facc47cb\\geth.exe"
"md5": "005b4040060d597026f3054462c4e2af",
"bin": "geth-windows-amd64-1.6.1-021c3c28\\geth.exe"
},
"bin": "geth.exe",
"commands": {
"sanity": {
"args": ["version"],
"output": [ "Geth", "1.6.0" ]
"args": [
"version"
],
"output": [
"Geth",
"1.6.1"
]
}
}
},
"ia32": {
"download": {
"url": "https://gethstore.blob.core.windows.net/builds/geth-windows-386-1.6.0-facc47cb.zip",
"url": "https://gethstore.blob.core.windows.net/builds/geth-windows-386-1.6.1-021c3c28.zip",
"type": "zip",
"md5": "0935e22c5626c73b9f0b556b3323c71a",
"bin": "geth-windows-386-1.6.0-facc47cb\\geth.exe"
"md5": "baf642bfb0c8f309e9e579bbb8fcf420",
"bin": "geth-windows-386-1.6.1-021c3c28\\geth.exe"
},
"bin": "geth.exe",
"commands": {
"sanity": {
"args": ["version"],
"output": [ "Geth", "1.6.0" ]
"args": [
"version"
],
"output": [
"Geth",
"1.6.1"
]
}
}
}
}
}
}
}
}
}
24 changes: 13 additions & 11 deletions gulpTasks/building.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,18 @@ gulp.task('build-dist', (cb) => {
dmg: {
background: '../build/dmg-background.jpg',
iconSize: 128,
contents: [{
x: 441,
y: 448,
type: 'link',
path: '/Applications'
},
{
x: 441,
y: 142,
type: 'file'
}
contents: [
{
x: 441,
y: 448,
type: 'link',
path: '/Applications'
},
{
x: 441,
y: 142,
type: 'file'
}
]
}
}
Expand All @@ -162,6 +163,7 @@ gulp.task('build-dist', (cb) => {
builder.build({
targets: builder.createTargets(targets, null, 'all'),
projectDir: path.join(__dirname, `../dist_${type}`, 'app'),
publish: 'never',
config: {
afterPack(params) {
return Q.try(() => {
Expand Down
1 change: 1 addition & 0 deletions gulpTasks/publishing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ gulp.task('upload-binaries', (cb) => {
if (draft.body && checksums) {
got.patch(`https://api.github.com/repos/ethereum/mist/releases/${draft.id}?access_token=${GITHUB_TOKEN}`, {
body: JSON.stringify({
tag_name: `v${version}`,
body: `${draft.body}\n\n## Checksums\n\`\`\`\n${checksums.join('')}\`\`\``
})
});
Expand Down
2 changes: 1 addition & 1 deletion interface/client/appStart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Meteor.startup(function () {
try {
numeral.language(lang);
} catch (err) {
console.error(`numeral.js couldn't set number formating: ${err.message}`);
console.warn(`numeral.js couldn't set number formating: ${err.message}`);
}
EthTools.setLocale(lang);
}
Expand Down
2 changes: 1 addition & 1 deletion interface/i18n/mist.en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
"enterPassword": "Enter password",
"repeatPassword": "Repeat password",
"creating": "Generating account...",
"backupHint": "Make sure you backup your keyfiles AND password!\n\nYou can find your keyfiles folder using the main menu -> Accounts -> Backup -> Accounts. Keep a copy of the \"keystore\" folder where you can't loose it!",
"backupHint": "Make sure you backup your keyfiles AND password!\n\nYou can find your keyfiles folder using the main menu -> Accounts -> Backup -> Accounts. Keep a copy of the \"keystore\" folder where you can't lose it!",
"errors": {
"passwordMismatch": "Your passwords don't match.",
"passwordTooShort": "Make a longer password"
Expand Down
4 changes: 2 additions & 2 deletions tests/mist/basic.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ test['Browser bar should not render script tags on breadcrumb view'] = function*
return client.getText('.url-breadcrumb').then((e) => {
return /404\.html$/.test(e);
});
}, 5000, 'expected breadcrumb to render as HTML encoded');
}, 8000, 'expected breadcrumb to render as HTML encoded');

should.exist(yield this.getUiElement('form.url'));
should.not.exist(yield this.getUiElement('form.url script'));
Expand Down Expand Up @@ -128,7 +128,7 @@ test['"javascript" protocol should be disallowed on browser bar'] = function* ()
})).value;
isProtocolBlocked.should.be.true;

yield Q.delay(500);
yield Q.delay(800);
const browserBarText = yield this.getBrowserBarText();
browserBarText.should.eql('http://localhost:8080'); // checks that hasn't changed displayed URL
};
Expand Down