jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-04-24 07:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2774 from balena-io/1.5.34

Browse Source 
1.5.34
This commit is contained in:
Alexis Svinartchouk 2019-05-10 12:19:17 +02:00 committed by GitHub
commit 3526a0e3c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gui/app/modules/analytics.js
View File

@ -27,7 +27,7 @@ const sentryToken = settings.get('analyticsSentryToken') ||
const mixpanelToken = settings.get('analyticsMixpanelToken') ||
_.get(packageJSON, [ 'analytics', 'mixpanel', 'token' ])
const configUrl = settings.get('configUrl') || 'http://balena.io/etcher/static/config.json'
const configUrl = settings.get('configUrl') || 'https://balena.io/etcher/static/config.json'
const DEFAULT_PROBABILITY = 0.1

2
lib/gui/etcher.js
View File

@ -30,7 +30,7 @@ const { getConfig } = require('../shared/utils')
const config = settings.getDefaults()
const configUrl = settings.get('configUrl') || 'http://balena.io/etcher/static/config.json'
const configUrl = settings.get('configUrl') || 'https://balena.io/etcher/static/config.json'
/**
*

28
npm-shrinkwrap.json generated
View File

@ -5273,9 +5273,9 @@
"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
},
"etcher-sdk": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-2.0.5.tgz",
"integrity": "sha512-222NEcUeKQqvBf0rPL0mmuEIuxpuQpmMSZRLv3mCXsOT4/cgtYPbwQAlEtTbRPRbFMfyO+7yhwf20PXgfhU5/A==",
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-2.0.7.tgz",
"integrity": "sha512-flZ3wklxD72aY3Rt1YiUuvrvjOA/SVzvVXYa9Q2rQsweDlSoQFFIKO9Gr9qj7Nvf+1B9uzQFI+aQ4a720Iu0Mg==",
"requires": {
"@types/node": "^6.0.112",
"axios": "^0.18.0",
@ -5418,21 +5418,21 @@
}
},
"ext2fs": {
"version": "1.0.27",
"resolved": "https://registry.npmjs.org/ext2fs/-/ext2fs-1.0.27.tgz",
"integrity": "sha512-YuZE43bUG3UI9NkuYu5cVIk2u2DTRUdFsCzK1RWUoTT4BaLiplePVXTN+KXOOKVtHyUeJLkzHIga+QrmKFd0yg==",
"version": "1.0.28",
"resolved": "https://registry.npmjs.org/ext2fs/-/ext2fs-1.0.28.tgz",
"integrity": "sha512-ykykxISMMrFlFywtRDDdLiiMrnvVi8u+CEzf+DAxmE7mR71w+MLCp8/MS3ePtG3SeDZlp7cJV/DkkPrR4a0Evg==",
"requires": {
"async": "^2.6.1",
"bindings": "^1.3.0",
"bluebird": "^3.5.3",
"nan": "2.11.1",
"nan": "2.13.2",
"prebuild-install": "^5.2.1"
},
"dependencies": {
"nan": {
"version": "2.11.1",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
"integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA=="
"version": "2.13.2",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
"integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
}
}
},
@ -10497,12 +10497,12 @@
}
},
"resin-image-fs": {
"version": "5.0.7",
"resolved": "https://registry.npmjs.org/resin-image-fs/-/resin-image-fs-5.0.7.tgz",
"integrity": "sha512-VznWD2aoEvQI68DXm9XOZSCumDvAbCzkOBUOsjWf3N5h3AnM7xjQp5LHlDyYTXr4ngDeadC+nMtihjqltIzHIg==",
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/resin-image-fs/-/resin-image-fs-5.0.8.tgz",
"integrity": "sha512-m3DPKAdErmgxMkOhGP9NOyqZor0DADkuDKb38XSjlhxj5lJMEtLi7AuZauyl4ysINc4u+ljMDW9IqGNpXhFcXw==",
"requires": {
"bluebird": "^3.5.1",
"ext2fs": "^1.0.23",
"ext2fs": "^1.0.28",
"fatfs": "^0.10.6",
"file-disk": "^6.0.0",
"lodash": "^4.17.5",

2
package.json
View File

@ -49,7 +49,7 @@
"debug": "^3.1.0",
"electron-is-running-in-asar": "^1.0.0",
"electron-updater": "4.0.6",
"etcher-sdk": "^2.0.5",
"etcher-sdk": "^2.0.7",
"flexboxgrid": "^6.3.0",
"immutable": "^3.8.1",
"inactivity-timer": "^1.0.0",