385 Commits

Author SHA1 Message Date
Michael Teeuw
fcfe83f0cc Merge pull request #599 from qistoph/hover
Pass pointer-events on fullscreen overlay to underlaying modules
2017-01-12 19:44:46 +01:00
Michael Teeuw
5cbcded929 Merge branch 'develop' into russian_translations2 2017-01-12 19:42:50 +01:00
Michael Teeuw
fc06ffdcee Merge branch 'develop' into master 2017-01-12 19:40:53 +01:00
Michael Teeuw
1601179081 Merge pull request #613 from roramirez/pm2_start
Pm2 start
2017-01-12 19:39:03 +01:00
Alex Barcelo
ab9e0f891a updating CHANGELOG 2017-01-12 17:35:04 +01:00
Courtney Pitcher
07d5b07748 Update Changelog.md 2017-01-11 21:48:33 +02:00
Courtney Pitcher
d47b9cd5c0 Merge branch 'develop' into master 2017-01-11 21:47:19 +02:00
IgniparousTempest
d542c063d7 Updated CHANGELOG.md to include Afrikkans translation 2017-01-11 21:42:31 +02:00
Thomas Bachmann
3ba16f1773 Merge remote-tracking branch 'MichMich/develop' 2017-01-11 11:32:20 +01:00
Sergey Morozov
544e7fce88 removing .gitignore changes and changelog notes about it 2017-01-10 11:05:37 -08:00
Michael Teeuw
f31049cf69 Merge branch 'develop' into fixdefmod 2017-01-10 19:52:20 +01:00
Michael Teeuw
2b3b73b3f1 Merge pull request #600 from roramirez/config_sample-installer
modified installer to use config.js.sample for init config.
2017-01-10 19:46:38 +01:00
Chris van Marle
2e9b6ead2e Fix gitignore to not ignore default modules folder
/modules/** makes git ignore all directories and files in /modules, so
it's not even looking in /modules/default for changes.
!/modules/default/** is therefore never used. By adding the new line
!/modules/default, git is told to look in the /modules/default folder
for changes and will find all sub files/dirs and match these on
!/modules/default/**.
2017-01-10 11:31:00 +01:00
Rodrigo Ramírez Norambuena
d71fd0ff2d Add pm2 configuration for manager MagicMirror in script installer 2017-01-09 20:39:48 -03:00
Sergey Morozov
d019f88e26 Merge branch 'develop' into russian_translations2 2017-01-06 11:24:52 -08:00
Sergey Morozov
01cf4cc1ed Added Russian Translations
Redo of the PR #598

**Added:**
- Russian Translations

**Fixed:**
- corrected .gitignore rules for default modules

(Reasoning behind change: when I added translation for `alert` module `git add` was telling me that `.gitignore` rule excludes files and folders under `modules/default`)

I also noticed that `.gitignore:56` has following declaration:

```
!/modules/node_helper
!/modules/node_helper/**
```
but I don't think this directory structure exists today (also there is a small typo)
2017-01-06 11:21:20 -08:00
Rodrigo Ramírez Norambuena
396bbd83c8 modified installer to use config.js.sample for init config. 2017-01-05 16:09:41 -03:00
Chris van Marle
92e0affb85 Disable pointer-events on fullscreen overlay 2017-01-05 10:14:52 +01:00
Rodrigo Ramez Norambuena
6552157894 Remove white flash on boot up
When the electron app is started appear a white flash before show the
MagicMirror system.

This patch remove the white flash on boot up.
2017-01-04 13:06:24 -03:00
Thomas Bachmann
09531b399a Fixed Link formatting in MD 2017-01-04 11:04:33 +01:00
Thomas Bachmann
0099b6d4a2 Added change to CHANGELOG.md 2017-01-04 10:56:03 +01:00
Michael Teeuw
8ac8b666bf Update CHANGELOG.md 2017-01-04 08:59:37 +01:00
Chris van Marle
4882a801d2 Update CHANGELOG 2017-01-03 17:46:41 +01:00
Michael Teeuw
98855de71f Changes in preperation of 2.1.1 2016-12-31 21:25:49 +01:00
Michael Teeuw
da772e6649 Add release date. 2016-12-31 21:12:53 +01:00
Michael Teeuw
23bcac2e55 Merge pull request #585 from roramirez/extra-spaces
fix tabs, remove extra spaces and lines.
2016-12-31 19:12:24 +01:00
Rodrigo Ramírez Norambuena
19d906c5e4 fix tabs, remove extra spaces and lines. 2016-12-29 22:23:08 -03:00
Rodrigo Ramírez Norambuena
f58e758a41 global: Add the root_path variable in global.
This will can be help for work the better way in use the path into
the core and modules.
2016-12-27 14:31:35 -03:00
Daniel Buecheler
a12a4cd8f2 Merge remote-tracking branch 'mich/develop' into hidePrivate
Resolved merge conflict
2016-12-22 21:53:47 +01:00
Andreas 'count' Kotes
6a184b069b make electronOptions configurable, remove kioskmode from documentation 2016-12-13 13:59:24 +01:00
Rodrigo Ramírez Norambuena
53d2c7e89f compliments: add abilty to set classes for compliments module 2016-12-09 10:49:49 -03:00
Olexandr Savchuk
15c5725829 Merge branch 'develop' into electron-zoom-factor 2016-12-08 15:54:52 +01:00
Olexandr Savchuk
7d08a7c9cd Added documentation and changelog entry. 2016-12-02 21:14:41 +01:00
Olexandr Savchuk
32df3e80b1 Renamed roundTemperature option to roundTemp
Added changelog entry
2016-12-02 17:33:41 +01:00
Daniel Bücheler
7afc908c32 Added hidePrivate option of calendar module 2016-11-30 21:28:49 +01:00
Brian
829ccfca88 Updated changelog and compliments documentation. 2016-11-30 10:31:19 -05:00
Andreas
35f2ebc2aa Fixed Global Default Config Being Modified 2016-11-26 15:33:10 +01:00
Rodrigo Ramírez Norambuena
a05d7059fb Update CHANGELOG 2016-11-25 21:54:03 -03:00
Jopyth
c584b51726 Update CHANGELOG.md 2016-11-20 16:49:30 +01:00
Jopyth
7f86d2aa0a Fix typo 2016-11-18 17:07:55 +01:00
Nicholas Hubbard
690d461693
Update CHANGELOG 2016-11-17 10:33:13 -05:00
Nicholas Hubbard
4f4fe5f06b Update Electron: Part II
Add the change to the changelog.
2016-11-16 20:04:56 -05:00
Rodrigo Ramírez Norambuena
62567264f0 Config: Add option disabled for modules configuration 2016-11-14 14:45:59 -03:00
Michael Teeuw
0bab32315c Merge PR 2016-11-10 20:06:00 +01:00
Michael Teeuw
7e881dd850 Merge branch 'compliments_from_currentweather' of https://github.com/roramirez/MagicMirror into roramirez-compliments_from_currentweather 2016-11-10 20:03:58 +01:00
Rodrigo Ramez Norambuena
70d6d4246d compliments: Add feature use current weather.
Possibility the use the actual type of currentweather to show the
compliments.
2016-11-10 15:11:18 -03:00
Chris van Marle
70befe900c Update changelog 2016-11-10 17:28:39 +01:00
Stefan Bols
9812654bfa Update CHANGELOG.md 2016-11-09 17:30:20 +01:00
Michael Teeuw
50b37f2ddd Update changelog. 2016-11-08 20:11:46 +01:00
Michael Teeuw
e05431c847 Merge pull request #482 from roramirez/fix_change_log_pr_479
Fix the position for the feature note added in the Pull Request #479
2016-11-06 12:34:43 +01:00