From 602119fa41010fa8c61e44c5c5cc36b2f6780aec Mon Sep 17 00:00:00 2001 From: sergge1 <49363121+sergge1@users.noreply.github.com> Date: Fri, 31 Jan 2020 11:17:11 +0200 Subject: [PATCH 01/17] Ukrainian translation added --- translations/uk.json | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 translations/uk.json diff --git a/translations/uk.json b/translations/uk.json new file mode 100644 index 00000000..b9e154ab --- /dev/null +++ b/translations/uk.json @@ -0,0 +1,36 @@ +{ + "LOADING": "Завантаження …", + + "TODAY": "Сьогодні", + "TOMORROW": "Завтра", + "DAYAFTERTOMORROW": "Післязавтра", + "RUNNING": "Закінчується через", + "EMPTY": "Немає найближчих подій", + + "WEEK": "Тиждень {weekNumber}", + + "N": "Пн", + "NNE": "ПнПнСх", + "NE": "ПнСх", + "ENE": "СхПнСх", + "E": "Сх", + "ESE": "СхПдСх", + "SE": "СхПд", + "SSE": "СхСхПд", + "S": "Пд", + "SSW": "ПдПдЗх", + "SW": "ПдЗх", + "WSW": "ЗхПдЗх", + "W": "Зх", + "WNW": "ЗхПнЗх", + "NW": "ПнЗх", + "NNW": "ПнПнЗх", + + "UPDATE_NOTIFICATION": "Є оновлення для MagicMirror².", + "UPDATE_NOTIFICATION_MODULE": "Є оновлення для модуля {MODULE_NAME}.", + "UPDATE_INFO_SINGLE": "Поточна версія на {COMMIT_COUNT} комміт позаду від гілки {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Поточна інсталяція на {COMMIT_COUNT} комітів позаду від гілки {BRANCH_NAME}.", + + "FEELS": "Відчувається як", + "PRECIP": "Опади" +} From c41d6965abfc45a8b56b443b1cb7115324e31c87 Mon Sep 17 00:00:00 2001 From: sergge1 <49363121+sergge1@users.noreply.github.com> Date: Fri, 31 Jan 2020 11:18:43 +0200 Subject: [PATCH 02/17] added Ukrainian translation --- translations/translations.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/translations/translations.js b/translations/translations.js index 2b6f65bf..4cc6420d 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -42,7 +42,8 @@ var translations = { "sk" : "translations/sk.json", // Slovak "tlh" : "translations/tlh.json", // Klingon "ms-my" : "translations/ms-my.json", // Malay - "he" : "translations/he.json" // Hebrew + "he" : "translations/he.json", // Hebrew + "uk" : "translations/uk.json" // Ukrainian }; if (typeof module !== "undefined") {module.exports = translations;} From d7f6f46805e4f0618c6caf07a8b3e19dcac479a0 Mon Sep 17 00:00:00 2001 From: sergge1 <49363121+sergge1@users.noreply.github.com> Date: Fri, 31 Jan 2020 11:28:00 +0200 Subject: [PATCH 03/17] 2.11.0 - added Ukrainian translation --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 060abab6..53441236 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - cleanup installers folder, remove externalized scripts ### Added +- Ukrainian translation. - Finnish translation for "PRECIP", "UPDATE_INFO_MULTIPLE" and "UPDATE_INFO_SINGLE". - Added the ability to hide the temp label and weather icon in the `currentweather` module to allow showing only information such as wind and sunset/rise. - The `clock` module now optionally displays sun and moon data, including rise/set times, remaining daylight, and percent of moon illumination. From 88b15797a0a55807034f249f6a9643ba3d8fba60 Mon Sep 17 00:00:00 2001 From: Kurtis Blankenship Date: Fri, 31 Jan 2020 20:35:46 -0600 Subject: [PATCH 04/17] fix: add missing +1 for month --- modules/default/calendar/vendor/ical.js/node-ical.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/calendar/vendor/ical.js/node-ical.js b/modules/default/calendar/vendor/ical.js/node-ical.js index 1da04375..593dc1e0 100644 --- a/modules/default/calendar/vendor/ical.js/node-ical.js +++ b/modules/default/calendar/vendor/ical.js/node-ical.js @@ -28,7 +28,7 @@ var rrule = require('rrule').RRule function getLocaleISOString(date) { var year = date.getFullYear().toString(10).padStart(4,'0'); - var month = date.getMonth().toString(10).padStart(2,'0'); + var month = (date.getMonth().toString(10) + 1).padStart(2,'0'); var day = date.getDate().toString(10).padStart(2,'0'); var hour = date.getHours().toString(10).padStart(2,'0'); var minute = date.getMinutes().toString(10).padStart(2,'0'); From ca49d8adb323543380cfa72c31851678ee36f644 Mon Sep 17 00:00:00 2001 From: Kurtis Blankenship Date: Fri, 31 Jan 2020 20:46:43 -0600 Subject: [PATCH 05/17] fix: correcting syntax --- modules/default/calendar/vendor/ical.js/node-ical.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/calendar/vendor/ical.js/node-ical.js b/modules/default/calendar/vendor/ical.js/node-ical.js index 593dc1e0..424fd2e6 100644 --- a/modules/default/calendar/vendor/ical.js/node-ical.js +++ b/modules/default/calendar/vendor/ical.js/node-ical.js @@ -28,7 +28,7 @@ var rrule = require('rrule').RRule function getLocaleISOString(date) { var year = date.getFullYear().toString(10).padStart(4,'0'); - var month = (date.getMonth().toString(10) + 1).padStart(2,'0'); + var month = (date.getMonth() + 1).toString(10).padStart(2,'0'); var day = date.getDate().toString(10).padStart(2,'0'); var hour = date.getHours().toString(10).padStart(2,'0'); var minute = date.getMinutes().toString(10).padStart(2,'0'); From 09c1ea992c669cad3fe24eeb7fd328fc0d526906 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 13:56:15 +0100 Subject: [PATCH 06/17] Update start methods. --- CHANGELOG.md | 3 ++ js/app.js | 6 +++- package.json | 3 +- run-start.sh | 75 -------------------------------------------------- untrack-css.sh | 11 -------- 5 files changed, 10 insertions(+), 88 deletions(-) delete mode 100755 run-start.sh delete mode 100755 untrack-css.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 53441236..a97536ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Updated config.js.sample: Corrected some grammar on `config.js.sample` comment section. +- Remove `run-start.sh` script and update start commands: + - To start using electron, use `npm run start`. + - To start in server only mode, use `npm run server`. ## [2.11.0] - Unreleased (Develop Branch) diff --git a/js/app.js b/js/app.js index 3c7a51f8..920d0c49 100644 --- a/js/app.js +++ b/js/app.js @@ -4,7 +4,6 @@ * By Michael Teeuw http://michaelteeuw.nl * MIT Licensed. */ - var fs = require("fs"); var Server = require(__dirname + "/server.js"); var Utils = require(__dirname + "/utils.js"); @@ -24,6 +23,11 @@ console.log("Starting MagicMirror: v" + global.version); // global absolute root path global.root_path = path.resolve(__dirname + "/../"); +if (!process.env.DISPLAY) { + console.log("DISPLAY environment variable not set. Using DISPLAY=:0"); + process.env.DISPLAY = ":0"; +} + if (process.env.MM_CONFIG_FILE) { global.configuration_file = process.env.MM_CONFIG_FILE; } diff --git a/package.json b/package.json index 42baf1da..31490b5f 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": { - "start": "./run-start.sh", + "start": "./node_modules/.bin/electron js/electron.js", + "server": "node ./serveronly", "install": "cd vendor && npm install", "install-fonts": "cd fonts && npm install", "postinstall": "sh untrack-css.sh && sh installers/postinstall/postinstall.sh && npm run install-fonts", diff --git a/run-start.sh b/run-start.sh deleted file mode 100755 index f4c2d4e3..00000000 --- a/run-start.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash - # use bash instead of sh -./untrack-css.sh - -if grep docker /proc/1/cgroup -qa; then - # if running in docker, only start electron - - electron js/electron.js $1; -else - # not running in docker - - if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty - export DISPLAY=:0 # Set by default display - fi - # get the processor architecture - arch=$(uname -m) - false='false' - - # get the config option, if any - # only check non comment lines - serveronly=$(grep -v '^\s//' config/config.js | grep -i serveronly: | awk '{print tolower($2)}' | tr -d ,\"\') - # set default if not defined in config - serveronly=${serveronly:-false} - # check for xwindows running - xorg=$(pgrep Xorg) - #check for macOS - mac=$(uname) - # - # if the user requested serveronly OR - # electron support for armv6l has been dropped OR - # system is in text mode - # - if [ "$serveronly." != "false." -o "$arch" == "armv6l" ] || [ "$xorg." == "." -a $mac != 'Darwin' ]; then - - # if user explicitly configured to run server only (no ui local) - # OR there is no xwindows running, so no support for browser graphics - if [ "$serveronly." == "true." -o "$xorg." == "." ]; then - # start server mode, - node serveronly - else - # start the server in the background - # wait for server to be ready - # need bash for this - exec 3< <(node serveronly) - - # Read the output of server line by line until one line 'point your browser' - while read line; do - case "$line" in - *point\ your\ browser*) - echo $line - break - ;; - *) - echo $line - #sleep .25 - ;; - esac - done <&3 - - # Close the file descriptor - exec 3<&- - - # lets use chrome to display here now - # get the server port address from the ready message - port=$(echo $line | awk -F\: '{print $4}') - # start chromium - echo "Starting chromium browser now, have patience, it takes a minute" - chromium-browser -noerrdialogs -kiosk -start_maximized --disable-infobars --app=http://localhost:$port --ignore-certificate-errors-spki-list --ignore-ssl-errors --ignore-certificate-errors 2>/dev/null - exit - fi - else - # we can use electron directly - electron js/electron.js $1; - fi -fi \ No newline at end of file diff --git a/untrack-css.sh b/untrack-css.sh deleted file mode 100755 index d5969b84..00000000 --- a/untrack-css.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Long history here -# https://github.com/MichMich/MagicMirror/pull/1540 -STATUS_CUSTOM_CSS=$(git ls-files -v css/custom.css| awk '{print $1}') - -if [ "$STATUS_CUSTOM_CSS" = "H" ]; then - echo "We'll remove from the repository the css/custom.css" - echo "This script apply git update-index --skip-worktree css/custom.css" - git update-index --skip-worktree css/custom.css - git rm --cached css/custom.css -fi - From 21dbaa1a0335597d558ef733019a7b26f5bcb225 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 13:59:13 +0100 Subject: [PATCH 07/17] Move DISPLAY default to electron script. --- js/app.js | 5 ----- js/electron.js | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/app.js b/js/app.js index 920d0c49..08612dd8 100644 --- a/js/app.js +++ b/js/app.js @@ -23,11 +23,6 @@ console.log("Starting MagicMirror: v" + global.version); // global absolute root path global.root_path = path.resolve(__dirname + "/../"); -if (!process.env.DISPLAY) { - console.log("DISPLAY environment variable not set. Using DISPLAY=:0"); - process.env.DISPLAY = ":0"; -} - if (process.env.MM_CONFIG_FILE) { global.configuration_file = process.env.MM_CONFIG_FILE; } diff --git a/js/electron.js b/js/electron.js index c5e9c4cb..77820db2 100644 --- a/js/electron.js +++ b/js/electron.js @@ -1,5 +1,10 @@ /* jshint esversion: 6 */ +if (!process.env.DISPLAY) { + console.log("DISPLAY environment variable not set. Using DISPLAY=:0"); + process.env.DISPLAY = ":0"; +} + "use strict"; const electron = require("electron"); From 7f2ecbd04f2f9f549a581f70ebe0c0d594b5871b Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 14:32:38 +0100 Subject: [PATCH 08/17] Cleanup. --- installers/postinstall/postinstall.sh | 2 -- package.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 installers/postinstall/postinstall.sh diff --git a/installers/postinstall/postinstall.sh b/installers/postinstall/postinstall.sh deleted file mode 100644 index dc19df98..00000000 --- a/installers/postinstall/postinstall.sh +++ /dev/null @@ -1,2 +0,0 @@ -echo "\033[32mMagicMirror installation successful!" -exit 0 diff --git a/package.json b/package.json index 31490b5f..21618fe1 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "server": "node ./serveronly", "install": "cd vendor && npm install", "install-fonts": "cd fonts && npm install", - "postinstall": "sh untrack-css.sh && sh installers/postinstall/postinstall.sh && npm run install-fonts", + "postinstall": "npm run install-fonts", "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive", "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive", "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive", From e2afee32755a075968760c2e19bf4fd311c40853 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 14:39:50 +0100 Subject: [PATCH 09/17] Add feedback. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 21618fe1..6209067e 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,9 @@ "scripts": { "start": "./node_modules/.bin/electron js/electron.js", "server": "node ./serveronly", - "install": "cd vendor && npm install", - "install-fonts": "cd fonts && npm install", - "postinstall": "npm run install-fonts", + "install": "echo \"Installing vendor files ...\n\n\" && cd vendor && npm install --loglevel=error", + "install-fonts": "echo \"Installing fonts ...\n\n\" && cd fonts && npm install --loglevel=error", + "postinstall": "npm run install-fonts && echo \"Installing done! Use `npm start` to start MagicMirror. \n\n\"", "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive", "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive", "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive", From 1b38e73eb201d33ae2badad70d1b93b1027d1aaf Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 14:41:46 +0100 Subject: [PATCH 10/17] Fix install scripts. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6209067e..091aec66 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,9 @@ "scripts": { "start": "./node_modules/.bin/electron js/electron.js", "server": "node ./serveronly", - "install": "echo \"Installing vendor files ...\n\n\" && cd vendor && npm install --loglevel=error", - "install-fonts": "echo \"Installing fonts ...\n\n\" && cd fonts && npm install --loglevel=error", - "postinstall": "npm run install-fonts && echo \"Installing done! Use `npm start` to start MagicMirror. \n\n\"", + "install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error", + "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error", + "postinstall": "npm run install-fonts && echo \"\nInstallation done! \"", "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive", "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive", "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive", From 65b1d61295d4b3cc552f4c4c84544495f2a2d008 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 14:43:43 +0100 Subject: [PATCH 11/17] Improve feedback. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 091aec66..3786b79d 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "server": "node ./serveronly", "install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error", "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error", - "postinstall": "npm run install-fonts && echo \"\nInstallation done! \"", + "postinstall": "npm run install-fonts && echo \"Installation finished successfully! \n\"", "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive", "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive", "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive", From e2d4a0fde8f2dfac7a6acb7a041538281f46092f Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 14:52:52 +0100 Subject: [PATCH 12/17] Improve Feedback. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3786b79d..9c753db7 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "server": "node ./serveronly", "install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error", "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error", - "postinstall": "npm run install-fonts && echo \"Installation finished successfully! \n\"", + "postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"", "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive", "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive", "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive", From 8ef8388c3289ce041ecb8aeb09d96b8844bd090e Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 15:02:47 +0100 Subject: [PATCH 13/17] Set default DISPLAY in package.json. --- js/electron.js | 5 ----- package.json | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/js/electron.js b/js/electron.js index 77820db2..c5e9c4cb 100644 --- a/js/electron.js +++ b/js/electron.js @@ -1,10 +1,5 @@ /* jshint esversion: 6 */ -if (!process.env.DISPLAY) { - console.log("DISPLAY environment variable not set. Using DISPLAY=:0"); - process.env.DISPLAY = ":0"; -} - "use strict"; const electron = require("electron"); diff --git a/package.json b/package.json index 9c753db7..1b150ed4 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": { - "start": "./node_modules/.bin/electron js/electron.js", + "start": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js", "server": "node ./serveronly", "install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error", "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error", From a41bae3132d046a3d30a79dd1ffbff3b70286b76 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 15:05:26 +0100 Subject: [PATCH 14/17] Cleanup --- CHANGELOG.md | 3 ++- installers/pm2_MagicMirror.json | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 installers/pm2_MagicMirror.json diff --git a/CHANGELOG.md b/CHANGELOG.md index a97536ba..bfcfe878 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). *This release is scheduled to be released on 2020-04-01.* ### Deleted -- cleanup installers folder, remove externalized scripts +- Remove installers. +- Remove externalized scripts. ### Added - Ukrainian translation. diff --git a/installers/pm2_MagicMirror.json b/installers/pm2_MagicMirror.json deleted file mode 100644 index 3f905020..00000000 --- a/installers/pm2_MagicMirror.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "apps" : [{ - "name" : "MagicMirror", - "script" : "/home/pi/MagicMirror/installers/mm.sh", - "watch" : ["/home/pi/MagicMirror/config/config.js"] - }] -} From cbcc893f649bfc370f3b5f59308b2e0f94ed3ce6 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 15:16:23 +0100 Subject: [PATCH 15/17] Restore MM.sh to keep PM2 working. --- installers/mm.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 installers/mm.sh diff --git a/installers/mm.sh b/installers/mm.sh new file mode 100755 index 00000000..f5a65fbe --- /dev/null +++ b/installers/mm.sh @@ -0,0 +1,3 @@ +# This file is still here to keep PM2 working on older installations. +cd ~/MagicMirror +DISPLAY=:0 npm start. \ No newline at end of file From 19afd89df51147d49888afdd505b8b8b8a0e1e34 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 16:48:35 +0100 Subject: [PATCH 16/17] Fix Typo --- installers/mm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/mm.sh b/installers/mm.sh index f5a65fbe..cbbadd24 100755 --- a/installers/mm.sh +++ b/installers/mm.sh @@ -1,3 +1,3 @@ # This file is still here to keep PM2 working on older installations. cd ~/MagicMirror -DISPLAY=:0 npm start. \ No newline at end of file +DISPLAY=:0 npm start From 1315aceb44913988bda73e2fbd4c2996df40d178 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Feb 2020 17:41:49 +0100 Subject: [PATCH 17/17] Remove duplicate 2.11 entry. --- CHANGELOG.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfcfe878..7d22bbc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,15 +3,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² core. - -## [2.11.0] - 2020-01-24 - -### Changed -- Updated config.js.sample: Corrected some grammar on `config.js.sample` comment section. -- Remove `run-start.sh` script and update start commands: - - To start using electron, use `npm run start`. - - To start in server only mode, use `npm run server`. +❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² ## [2.11.0] - Unreleased (Develop Branch) @@ -36,6 +28,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Updated - Remove documentation from core repository and link to new dedicated docs site: [docs.magicmirror.builders](https://docs.magicmirror.builders). +- Updated config.js.sample: Corrected some grammar on `config.js.sample` comment section. +- Removed `run-start.sh` script and update start commands: + - To start using electron, use `npm run start`. + - To start in server only mode, use `npm run server`. ## [2.10.1] - 2020-01-10