From 7cf3c797e5954062bd4455dceb685b1c309a3636 Mon Sep 17 00:00:00 2001 From: campersau Date: Mon, 11 Nov 2019 19:30:42 +0100 Subject: [PATCH 1/2] release 1.5.0 --- CHANGELOG.md | 12 +++++++++--- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f83c923c..b1b78af9d 100644 --- a/CHANGELOG.md +++ b/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) - 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) diff --git a/package-lock.json b/package-lock.json index 5f6542081..aba04dcfe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ungit", - "version": "1.4.48", + "version": "1.5.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 24cce4e7b..06d37fab8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ungit", "author": "Fredrik Norén ", "description": "Git made easy", - "version": "1.4.48", + "version": "1.5.0", "ungitPluginApiVersion": "0.2.0", "scripts": { "start": "node ./bin/ungit", From 2a9836b33a48d078076412ca39f93d0975e5a675 Mon Sep 17 00:00:00 2001 From: campersau Date: Tue, 12 Nov 2019 10:12:14 +0100 Subject: [PATCH 2/2] update readme to include link to github releases for eletron packages --- CHANGELOG.md | 2 +- README.md | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1b78af9d..357c850f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ We are following the [Keep a Changelog](https://keepachangelog.com/) format. - 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) +- 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) diff --git a/README.md b/README.md index c78ac0cb5..a50c64a1f 100644 --- a/README.md +++ b/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,13 +20,13 @@ 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 @@ -34,6 +34,8 @@ NOTE: If your system requires root access to install global npm packages, make s 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: