From c798913fd230d919c5333b021c554838f10a2be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 3 Apr 2017 15:18:20 -0300 Subject: [PATCH 1/4] Fix extra tabs added in config.js.sample --- config/config.js.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.js.sample b/config/config.js.sample index 9b8787bb..6d933453 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -8,9 +8,9 @@ var config = { port: 8080, ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses // or add a specific IPv4 of 192.168.1.5 : - // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"], - // or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format : - // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"], + // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"], + // or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format : + // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"], language: "en", timeFormat: 24, From e44893f91e1e063d3d75cff1258d22ef04aea79f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 4 Apr 2017 11:06:03 -0300 Subject: [PATCH 2/4] Fix instruction README for install by script issue close #823 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 98ca4154..48694365 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Electron, the app wrapper around MagicMirror², only supports the Raspberry Pi 2 Execute the following command on your Raspberry Pi to install MagicMirror²: ```` -curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh | bash +bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh)" ```` ### Manual Installation From 95278a78ff02ade1c5cc2a3003dd20dd51a10289 Mon Sep 17 00:00:00 2001 From: Greg Dev Date: Wed, 5 Apr 2017 23:39:39 +0200 Subject: [PATCH 3/4] Add Russian translation for week --- translations/ru.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/translations/ru.json b/translations/ru.json index 48c49fd9..c919af50 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -7,6 +7,8 @@ "RUNNING": "Заканчивается через", "EMPTY": "Нет предстоящих событий", + "WEEK": "Неделя", + "N": "С", "NNE": "ССВ", "NE": "СВ", From c53a20a577bf41e69ab979150758644a2092a5a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Wed, 5 Apr 2017 22:01:49 -0300 Subject: [PATCH 4/4] Add changelog entry fix instruction_installer --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d883b16..e249999e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Added missing keys to Polish translation. - Added missing key to German translation. +### Fixed +- Fix instruction in README for using automatically installer script. + ## [2.1.1] - 2017-04-01 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`