chore: merge with upstream/master

This commit is contained in:
Heo Sangmin
2018-05-25 17:53:39 +09:00
3 changed files with 8 additions and 7 deletions

View File

@@ -1,6 +1,13 @@
### Changelog
All notable changes to this project will be documented in this file.
#### [Unreleased](https://github.com/maximegris/angular-electron/compare/3.3.0...3.4.0)
- Resolved Translation issue [`#186`](https://github.com/maximegris/angular-electron/pull/186)
- Removed unused file [`#185`](https://github.com/maximegris/angular-electron/pull/185)
- ref/ remove contributors [`6dc97a1`](https://github.com/maximegris/angular-electron/commit/6dc97a1ea857b48a7a111768f58498c91a3572b5)
- Translation issue [`35354b1`](https://github.com/maximegris/angular-electron/commit/35354b1025d98fd14d0566d3aa3112bb9c36fc91)
- version 3.4.0 [`06d6b0f`](https://github.com/maximegris/angular-electron/commit/06d6b0f8c5de703a9c7f5dcfc880a9673aa6eec8)
#### [3.3.0](https://github.com/maximegris/angular-electron/compare/3.2.0...3.3.0)
- add Changelog file [`71083f1`](https://github.com/maximegris/angular-electron/commit/71083f12bf1e20225769af20a8a054ab8af4a6f9)
- version 3.3.0 [`a88bda6`](https://github.com/maximegris/angular-electron/commit/a88bda66d83690b1064bcb11a0cb1bb893894caf)

View File

@@ -85,12 +85,6 @@ You can desactivate "Developer Tools" by commenting `win.webContents.openDevTool
Maybe you want to execute the application in the browser (WITHOUT HOT RELOAD ACTUALLY...) ? You can do it with `npm run ng:serve`.
Note that you can't use Electron or NodeJS native libraries in this case. Please check `providers/electron.service.ts` to watch how conditional import of electron/Native libraries is done.
## Contributors
[<img alt="Maxime GRIS" src="https://avatars2.githubusercontent.com/u/10827551?v=3&s=117" width="117">](https://github.com/maximegris) |
:---:
|[Maxime GRIS](https://github.com/maximegris)|
[build-badge]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master
[build]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master
[dependencyci-badge]: https://dependencyci.com/github/maximegris/angular-electron/badge

View File

@@ -1,6 +1,6 @@
{
"name": "angular-electron",
"version": "3.3.0",
"version": "3.4.0",
"description": "Angular 5 with Electron (Typescript + SASS + Hot Reload)",
"homepage": "https://github.com/maximegris/angular-electron",
"author": {