diff --git a/.resinci.json b/.resinci.json index 539de2bf..601705a6 100644 --- a/.resinci.json +++ b/.resinci.json @@ -14,7 +14,7 @@ }, "builder": { "appId": "io.balena.etcher", - "copyright": "Copyright 2016-2018 Balena Ltd", + "copyright": "Copyright 2016-2019 Balena Ltd", "productName": "balenaEtcher", "nodeGypRebuild": true, "files": [ diff --git a/CHANGELOG.md b/CHANGELOG.md index 037d9433..180107fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Misc - Reworked flashing logic with etcher-sdk +- Add support for flashing Raspberry Pi CM3+ - Upgrade to Electron v3. - Upgrade to NPM 6.7.0 - Fix incorrect drives list on Linux diff --git a/README.md b/README.md index 96e9469b..a45817b7 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,10 @@ was written correctly and much more. [**Download**][etcher] | [**Support**][SUPPORT] | [**Documentation**][USER-DOCUMENTATION] | [**Contributing**][CONTRIBUTING] | [**Roadmap**][milestones] -![Etcher](https://raw.githubusercontent.com/balena-io/etcher/master/screenshot.png) - ## Supported Operating Systems - Linux (most distros) -- macOS 10.9 and later +- macOS 10.10 (Yosemite) and later - Microsoft Windows 7 and later Note that Etcher will run on any platform officially supported by @@ -150,8 +148,8 @@ Etcher is free software, and may be redistributed under the terms specified in the [license]. [etcher]: https://balena.io/etcher -[electron]: http://electron.atom.io -[electron-supported-platforms]: http://electron.atom.io/docs/tutorial/supported-platforms/ +[electron]: https://electronjs.org/ +[electron-supported-platforms]: https://electronjs.org/docs/tutorial/support#supported-platforms [SUPPORT]: https://github.com/balena-io/etcher/blob/master/SUPPORT.md [CONTRIBUTING]: https://github.com/balena-io/etcher/blob/master/docs/CONTRIBUTING.md [USER-DOCUMENTATION]: https://github.com/balena-io/etcher/blob/master/docs/USER-DOCUMENTATION.md diff --git a/assets/dmg/background.tiff b/assets/dmg/background.tiff index 20b7c830..7a191f4a 100755 Binary files a/assets/dmg/background.tiff and b/assets/dmg/background.tiff differ diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 854c2bbe..a721b35b 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -52,10 +52,12 @@ The following MinGW packages are required: - `msys-bash` - `msys-coreutils` -#### OS X +#### macOS -- [XCode](https://developer.apple.com/xcode/) or [XCode Command Line Tools], -which can be installed by running `xcode-select --install`. +- [Xcode](https://developer.apple.com/xcode/) + +It's not enough to have [Xcode Command Line Tools] installed. Xcode must be installed +as well. #### Linux @@ -213,4 +215,4 @@ Don't hesitate to get in touch if you have any questions or need any help! [EditorConfig]: http://editorconfig.org [shrinkwrap]: https://docs.npmjs.com/cli/shrinkwrap [hxd]: https://github.com/jhermsmeier/hxd -[XCode Command Line Tools]: https://developer.apple.com/library/content/technotes/tn2339/_index.html +[Xcode Command Line Tools]: https://developer.apple.com/library/content/technotes/tn2339/_index.html diff --git a/docs/MAINTAINERS.md b/docs/MAINTAINERS.md index d15ff5f7..5e4a04f5 100644 --- a/docs/MAINTAINERS.md +++ b/docs/MAINTAINERS.md @@ -47,8 +47,6 @@ Releasing - Bump the version number in the `npm-shrinkwrap.json`'s `version` property - Add a new entry to `CHANGELOG.md` by running `make changelog` - Manually revise the `CHANGELOG.md` versionist output -- Update `screenshot.png` so it displays the latest version in the bottom -right corner - Revise the `updates.semverRange` version in `package.json` - Commit the changes with the version number as the commit title, including the `v` prefix, to `master`. For example: diff --git a/docs/USER-DOCUMENTATION.md b/docs/USER-DOCUMENTATION.md index fe9b30dd..2285c795 100644 --- a/docs/USER-DOCUMENTATION.md +++ b/docs/USER-DOCUMENTATION.md @@ -30,7 +30,7 @@ if you require this functionality, we advise to fallback to Deactivate desktop shortcut prompt on GNU/Linux ----------------------------------------------- -This is a feature provided by [AppImages](appimage), where the applications +This is a feature provided by [AppImages][appimage], where the applications prompts the user to automatically register a desktop shortcut to easily access the application. @@ -206,15 +206,15 @@ Running in older macOS versions ------------------------------- Etcher GUI is based on the [Electron][electron] framework, [which only supports -macOS 10.9 and newer versions][electron-supported-platforms]. +macOS 10.10 (Yosemite) and newer versions][electron-supported-platforms]. [balena.io]: https://balena.io [appimage]: http://appimage.org [xwayland]: https://wayland.freedesktop.org/xserver.html [weston.ini]: http://manpages.ubuntu.com/manpages/wily/man5/weston.ini.5.html [diskpart]: https://technet.microsoft.com/en-us/library/cc770877(v=ws.11).aspx -[electron]: http://electron.atom.io -[electron-supported-platforms]: https://github.com/electron/electron/blob/master/docs/tutorial/supported-platforms.md +[electron]: https://electronjs.org/ +[electron-supported-platforms]: https://electronjs.org/docs/tutorial/support#supported-platforms [publishing]: https://github.com/balena-io/etcher/blob/master/docs/PUBLISHING.md [windows-usb-tool]: https://www.microsoft.com/en-us/download/windows-usb-dvd-download-tool [rufus]: https://rufus.akeo.ie diff --git a/electron-builder.yml b/electron-builder.yml index 50ae5dee..bb72fbe6 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,5 +1,5 @@ appId: io.balena.etcher -copyright: Copyright 2016-2018 Balena Ltd +copyright: Copyright 2016-2019 Balena Ltd productName: balenaEtcher npmRebuild: false nodeGypRebuild: false diff --git a/lib/gui/app/components/modal/services/modal.js b/lib/gui/app/components/modal/services/modal.js index 52abea1d..192f2556 100644 --- a/lib/gui/app/components/modal/services/modal.js +++ b/lib/gui/app/components/modal/services/modal.js @@ -56,7 +56,8 @@ module.exports = function ($uibModal, $q) { template: options.template, controller: options.controller, size: options.size, - resolve: options.resolve + resolve: options.resolve, + backdrop: 'static' }) return { @@ -73,7 +74,7 @@ module.exports = function ($uibModal, $q) { resolve(value) }).catch((error) => { // Bootstrap doesn't 'resolve' these but cancels the dialog - if (error === 'escape key press' || error === 'backdrop click') { + if (error === 'escape key press') { analytics.logEvent('Modal rejected', { name: options.name, method: error, diff --git a/screenshot.png b/screenshot.png deleted file mode 100644 index 11aee82f..00000000 Binary files a/screenshot.png and /dev/null differ