From 6abdc4172b21eeea3031ccd953a50507de82b62a Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Thu, 12 May 2016 12:59:24 +0200 Subject: [PATCH 1/3] remove reference to v2-beta --- installers/raspberry.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/raspberry.sh b/installers/raspberry.sh index 3324679f..4eb6af72 100644 --- a/installers/raspberry.sh +++ b/installers/raspberry.sh @@ -126,7 +126,7 @@ if [ -d "$HOME/MagicMirror" ] ; then fi echo -e "\e[96mCloning MagicMirror ...\e[90m" -if git clone -b v2-beta https://github.com/MichMich/MagicMirror.git; then +if git clone https://github.com/MichMich/MagicMirror.git; then echo -e "\e[92mCloning MagicMirror Done!\e[0m" else echo -e "\e[91mUnable to clone MagicMirror." From 19b9fa1996de76cc74eaf9fcf09830f1e6e6658a Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Thu, 12 May 2016 13:01:44 +0200 Subject: [PATCH 2/3] Remove v2-beta references. --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index dea267e3..dfdf11c3 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ ![MagicMirror²: The open source modular smart mirror platform. ](.github/header.png)

- Dependency Status - devDependency Status + Dependency Status + devDependency Status Node Version License - Travis - Known Vulnerabilities + Travis + Known Vulnerabilities

**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](http://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MichMich/MagicMirror/graphs/contributors). @@ -33,13 +33,13 @@ 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/v2-beta/installers/raspberry.sh | bash +curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/installers/raspberry.sh | bash ```` #### Manual Installation 1. Download and install the latest Node.js version. -2. Clone the repository and check out the beta branch: `git clone -b v2-beta https://github.com/MichMich/MagicMirror` +2. Clone the repository and check out the beta branch: `git clone https://github.com/MichMich/MagicMirror` 3. Enter the repository: `cd ~/MagicMirror` 4. Install and run the app: `npm install && npm start` From b84e553d349ab194523be49719e37d01a137a5aa Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Thu, 12 May 2016 13:03:13 +0200 Subject: [PATCH 3/3] Remove v2-beta reference. --- modules/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/README.md b/modules/README.md index 43c694b3..54207399 100644 --- a/modules/README.md +++ b/modules/README.md @@ -298,7 +298,7 @@ If no translation is found, a fallback will be used. The fallback sequence is as - 4. Translation as defined in core translation file of the fallback language (the first defined core translation file). - 5. The key (identifier) of the translation. -When adding translations to your module, it's a good idea to see if an apropriate translation is already available in the [core translation files](https://github.com/MichMich/MagicMirror/tree/v2-beta/translations). This way, your module can benefit from the exsisting translations. +When adding translations to your module, it's a good idea to see if an apropriate translation is already available in the [core translation files](https://github.com/MichMich/MagicMirror/tree/master/translations). This way, your module can benefit from the exsisting translations. **Example:** ````javascript