kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity
3,076 Commits 3 Branches 49 Tags
Commit Graph

3076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Teeuw
1315aceb44
Remove duplicate 2.11 entry. 2020-02-01 17:41:49 +01:00
Michael Teeuw
19afd89df5
Fix Typo 2020-02-01 16:48:35 +01:00
Michael Teeuw
cbcc893f64 Restore MM.sh to keep PM2 working. 2020-02-01 15:16:23 +01:00
Michael Teeuw
a41bae3132 Cleanup 2020-02-01 15:05:26 +01:00
Michael Teeuw
8ef8388c32 Set default DISPLAY in package.json. 2020-02-01 15:02:47 +01:00
Michael Teeuw
e2d4a0fde8 Improve Feedback. 2020-02-01 14:52:52 +01:00
Michael Teeuw
65b1d61295 Improve feedback. 2020-02-01 14:43:43 +01:00
Michael Teeuw
1b38e73eb2 Fix install scripts. 2020-02-01 14:41:46 +01:00
Michael Teeuw
e2afee3275 Add feedback. 2020-02-01 14:39:50 +01:00
Michael Teeuw
7f2ecbd04f Cleanup. 2020-02-01 14:32:38 +01:00
Michael Teeuw
21dbaa1a03 Move DISPLAY default to electron script. 2020-02-01 13:59:13 +01:00
Michael Teeuw
09c1ea992c Update start methods. 2020-02-01 13:56:15 +01:00
karenorman
c8c327b6ab Add HTTPS support 2020-02-01 20:46:26 +08:00
Michael Teeuw
3bb801f579
Merge pull request #1914 from kblankenship1989/fix-iso-string 
fix: add missing +1 for month
 2020-02-01 04:57:12 +01:00
Kurtis Blankenship
ca49d8adb3 fix: correcting syntax 2020-01-31 20:46:43 -06:00
Kurtis Blankenship
88b15797a0 fix: add missing +1 for month 2020-01-31 20:35:46 -06:00
Michael Teeuw
28ebbd229c
Merge pull request #1910 from sergge1/develop 
added Ukrainian (uk) translation
 2020-01-31 19:51:48 +01:00
sergge1
d7f6f46805
2.11.0 - added Ukrainian translation 2020-01-31 11:28:00 +02:00
sergge1
c41d6965ab
added Ukrainian translation 2020-01-31 11:18:43 +02:00
sergge1
602119fa41
Ukrainian translation added 2020-01-31 11:17:11 +02:00
Michael Teeuw
4c2a9b47f5
Merge pull request #1906 from mmphego/develop 
Grammar fixes on config.js.sample file
 2020-01-26 16:46:48 +01:00
Michael Teeuw
5a26fefd6b
Merge pull request #1903 from roramirez/not-log-error-vendor-test 
Revert error logging introduced in 1e97b5c
 2020-01-26 16:46:06 +01:00
Mpho Mphego
85d26f7320
Grammar fixes to config. 
This PR does the following:

- [x] Corrects grammar on `config.js.sample`
 2020-01-26 14:10:24 +02:00
Michael Teeuw
9487af1852
Merge pull request #1901 from kolbyjack/fix-97e5d92-regression 
Fix regression causing 'undefined' to show up when config.hideTemp is…
 2020-01-24 17:46:45 +01:00
Jon Kolb
a5b09d7846 Update CHANGELOG.md 2020-01-24 10:51:24 -05:00
Jon Kolb
6ba5056c96 Fix regression causing 'undefined' to show up when config.hideTemp is false 2020-01-24 10:42:45 -05:00
Michael Teeuw
50b4d05ef5
Merge pull request #1899 from MichMich/Skip-weather 
Skip weather tests for now
 2020-01-23 19:56:23 +01:00
Michael Teeuw
13ebe6d0e1
Check method 2020-01-23 19:52:07 +01:00
Michael Teeuw
95dedf0d80
Skip weather tests for now 2020-01-23 19:38:15 +01:00
Michael Teeuw
89a9368166
Merge pull request #1896 from sejka/patch-1 
adds PRECIP polish translation
 2020-01-23 19:29:43 +01:00
Michael Teeuw
c10e6159da
Merge pull request #1895 from adi-miller/heb 
Add Hebrew translation
 2020-01-23 19:29:26 +01:00
Michael Teeuw
c30693b8a8
Merge pull request #1894 from roramirez/mode-permission-changelog 
Revert permission mode for CHANGELOG
 2020-01-23 19:28:59 +01:00
Michael Teeuw
7fc4f61182
Merge pull request #1892 from roramirez/upgrade-electron-6 
Upgrade to Electron 6:
 2020-01-23 19:28:37 +01:00
Karol Sejka
b44ab88927
adds PRECIP polish translation 2020-01-23 02:24:47 +01:00
adimi
2ca81f965a Add hebrew translation 2020-01-22 22:03:34 +02:00
Michael Teeuw
9f4dc1e382
Merge pull request #1887 from dtreskunov/dtreskunov/sun-and-moon 
fix calculation of duration until next sunrise
 2020-01-22 15:23:01 +01:00
Michael Teeuw
5ec9704e7f
Merge pull request #1893 from roramirez/vendor-fix-test 
Fix the vendor_spec test:
 2020-01-22 15:22:29 +01:00
Denis Treskunov
7ad0cfd5f6 update CHANGELOG.md 2020-01-21 19:16:42 -08:00
Denis Treskunov
ac8f679dfd Merge remote-tracking branch 'upstream/develop' into dtreskunov/sun-and-moon 2020-01-21 19:13:51 -08:00
Rodrigo Ramírez Norambuena
a7ee2ef3a6 Upgrade to Electron 6: 
New version of Electron has enable by default sandbox
http://www.atom.pe/docs/api/sandbox-option/

There was some issues to migrate a new version of Electron for
MagicMirror. Using the new version in Travis CI was failing at this
time. The problem is because the testing runner is a Docker enviroment

The issue experimented is the same topic mentioned here:
 - https://github.com/electron/electron/issues/17972
 - https://github.com/electron-userland/spectron/issues/443

The fix for to all of this is to set the `--no-sandbox` mode in CI
testing https://electronjs.org/docs/all#--no-sandbox

This change use the feature to set and disable Sandbox using
by enviroment variable `ELECTRON_DISABLE_SANDBOX=1`
https://github.com/electron/electron/pull/16576

This change has reference #1800
 2020-01-20 22:19:10 +00:00
Rodrigo Ramírez Norambuena
6e7edd9824 Revert error logging introduced in 1e97b5c 2020-01-19 08:50:37 -03:00
Rodrigo Ramírez Norambuena
81b310086f Revert permission mode for CHANGELOG 
This change revert change of permission mode for file CHANGELOG.md
introduced in commit a619fc4fefe17a2205537d48131b40e9f8076990
 2020-01-19 04:40:05 -03:00
Rodrigo Ramírez Norambuena
cce57c7229 Fix the vendor_spec test: 
This change set after startApplication the configuration to run this
test.

The previous statement when e2e are running using --recursive the
MM_CONFIG_FILE was setting by the test running before this one.
 2020-01-19 04:06:21 -03:00
Denis Treskunov
9cffa3dd67 fix calculation of duration until next sunrise 2020-01-18 17:02:40 -08:00
Michael Teeuw
7b3a59455d
Merge pull request #1885 from dtreskunov/dtreskunov/sun-and-moon 
add sun/moon rise/set times
 2020-01-18 21:29:41 +01:00
Michael Teeuw
fefe5659d3
Merge branch 'develop' into dtreskunov/sun-and-moon 2020-01-18 21:20:35 +01:00
Michael Teeuw
db72e22e61 Fuck it. 2020-01-18 21:17:54 +01:00
Michael Teeuw
a85ed709af Remove newlines. 2020-01-18 21:09:18 +01:00
Michael Teeuw
e24d1a1261 Fix newlines? 2020-01-18 21:02:49 +01:00
Michael Teeuw
d6f1bf18de
Merge pull request #1884 from kblankenship1989/fix-timeshift-calendar 
fix: Issue #1798 - fixing recurrent calendar events crosstime DST
 2020-01-18 19:59:24 +01:00