Merge pull request #1247 from campersau/release-1.5.0

Prepare Release 1.5.0

CHANGELOG.md

@@ -4,15 +4,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 We are following the [Keep a Changelog](https://keepachangelog.com/) format.
 
 ## Unreleased
-- Updated Octicons [#1224](https://github.com/FredrikNoren/ungit/pull/1224)
+
+## [1.5.0](https://github.com/FredrikNoren/ungit/compare/v1.4.48...v1.5.0)
+
+### Added
+- Include file diff in merge commits [#1242](https://github.com/FredrikNoren/ungit/pull/1242)
 - Hide diff buttons on hover [#1225](https://github.com/FredrikNoren/ungit/pull/1225)
+- Publish electron build [#1241](https://github.com/FredrikNoren/ungit/pull/1241)
+
+### Fixed
+- Updated Octicons [#1224](https://github.com/FredrikNoren/ungit/pull/1224), [#1245](https://github.com/FredrikNoren/ungit/pull/1245), [#1246](https://github.com/FredrikNoren/ungit/pull/1246)
 - Fix stash tooltips [#1227](https://github.com/FredrikNoren/ungit/pull/1227)
 - Improve git-init experience [#1228](https://github.com/FredrikNoren/ungit/pull/1228)
 - Fix inconsistent diff options [#1229](https://github.com/FredrikNoren/ungit/issues/1229)
 - Fix clearing .gitignore [#1236](https://github.com/FredrikNoren/ungit/pull/1236)
-- Fix electron package [#1240](https://github.com/FredrikNoren/ungit/pull/1240)
-- Include file diff in merge commits [#1242](https://github.com/FredrikNoren/ungit/pull/1242)
-- Restore icons on graph actions using Octicons [#1245](https://github.com/FredrikNoren/ungit/pull/1245)
+- Fix electron package [#1240](https://github.com/FredrikNoren/ungit/pull/1240), [#1248](https://github.com/FredrikNoren/ungit/pull/1248)
 - Minor fixes to remove warnings [#1235](https://github.com/FredrikNoren/ungit/pull/1235), [#1237](https://github.com/FredrikNoren/ungit/pull/1237), [#1238](https://github.com/FredrikNoren/ungit/pull/1238), [#1239](https://github.com/FredrikNoren/ungit/pull/1239)
 
 ## [1.4.48](https://github.com/FredrikNoren/ungit/compare/v1.4.47...v1.4.48)

README.md

@@ -1,6 +1,6 @@
 ungit
 ======
-[![NPM version](https://badge.fury.io/js/ungit.svg)](http://badge.fury.io/js/ungit)
+[![NPM version](https://badge.fury.io/js/ungit.svg)](https://badge.fury.io/js/ungit)
 [![Build Status](https://travis-ci.org/FredrikNoren/ungit.svg)](https://travis-ci.org/FredrikNoren/ungit)
 [![Join the chat at https://gitter.im/FredrikNoren/ungit](https://badges.gitter.im/FredrikNoren/ungit.svg)](https://gitter.im/FredrikNoren/ungit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -20,20 +20,22 @@ Ungit brings user friendliness to git without sacrificing the versatility of git
 
 [Follow @ungitui on twitter](https://twitter.com/ungitui)
 
-Quick intro to ungit: [http://youtu.be/hkBVAi3oKvo](http://youtu.be/hkBVAi3oKvo)
+Quick intro to ungit: [https://youtu.be/hkBVAi3oKvo](https://youtu.be/hkBVAi3oKvo)
 
-[![Screenshot](screenshot.png)](http://youtu.be/hkBVAi3oKvo)
+[![Screenshot](screenshot.png)](https://youtu.be/hkBVAi3oKvo)
 
 Installing
 ----------
-Requires [node.js](http://nodejs.org) (≥ 8.16.0), [npm](https://www.npmjs.com/) (≥ 3.10.10, comes with node.js) and [git](http://git-scm.com/) (≥ 1.8.x). To install ungit just type:
+Requires [node.js](https://nodejs.org) (≥ 8.16.0), [npm](https://www.npmjs.com/) (≥ 3.10.10, comes with node.js) and [git](https://git-scm.com/) (≥ 1.8.x). To install ungit just type:
 
 	npm install -g ungit
 
 NOTE: If your system requires root access to install global npm packages, make sure you use the -H flag:
 
 	sudo -H npm install -g ungit
 
+Prebuilt [electron](https://electronjs.org/) packages are avaiable [here](https://github.com/FredrikNoren/ungit/releases) (git is still required).
+
 Using
 -----
 Anywhere you want to start, just type:

package.json

@@ -2,7 +2,7 @@
   "name": "ungit",
   "author": "Fredrik Norén <[email protected]>",
   "description": "Git made easy",
-  "version": "1.4.48",
+  "version": "1.5.0",
   "ungitPluginApiVersion": "0.2.0",
   "scripts": {
     "start": "node ./bin/ungit",