From 9a46081d0ba7a7c4b2e28cfd59fed6cd7de6bd00 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sun, 30 Sep 2018 21:36:04 +0200 Subject: [PATCH 1/3] Prepare for release 2.5.0 --- CHANGELOG.md | 4 +--- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4afc38b6..b19efad3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). --- -## [2.5.0] - Unreleased - -*This release is scheduled to be released on 2018-10-01.* +## [2.5.0] - 2018-10-01 ### Added - Support multi-line compliments diff --git a/package-lock.json b/package-lock.json index 3376a2e3..928d1763 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.5.0-dev", + "version": "2.5.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2aae05eb..ab9735f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.5.0-dev", + "version": "2.5.0", "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": { From 6f2b04669ff5443350ab8af1719c77df5eb041e8 Mon Sep 17 00:00:00 2001 From: rudibarani <7797301+rudibarani@users.noreply.github.com> Date: Sun, 30 Sep 2018 23:39:22 +0200 Subject: [PATCH 2/3] Details to install the latest version of Node.js Added the direct code to always install the latest version of Node.js for the manual installation. Maybe you could also include this in the automatic setup script, which does not seem to install the latest version of Node.js. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1694ff65..9459b5db 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,9 @@ bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/maste #### Manual Installation -1. Download and install the latest *Node.js* version. +1. Download and install the latest *Node.js* version: +- `curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -` +- `sudo apt install -y nodejs` 2. Clone the repository and check out the master branch: `git clone https://github.com/MichMich/MagicMirror` 3. Enter the repository: `cd MagicMirror/` 4. Install and run the app with: `npm install && npm start` \ From d4fe01f9b99a6da31b59dd1fb9ef33e2725b9018 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Mon, 1 Oct 2018 08:20:15 +0200 Subject: [PATCH 3/3] Prepare for 2.6.0-dev. --- CHANGELOG.md | 11 +++++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b19efad3..bc50dfa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). --- + +## [2.6.0] - Unreleased + +*This release is scheduled to be released on 2018-10-01.* + +### Added + +### Fixed + +### Updated + ## [2.5.0] - 2018-10-01 ### Added diff --git a/package-lock.json b/package-lock.json index 928d1763..5dbbb730 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.5.0", + "version": "2.6.0-dev", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ab9735f2..31ebb804 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.5.0", + "version": "2.6.0-dev", "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": {