kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2026-07-06 06:12:26 -07:00
Code Issues Projects Releases Wiki Activity
2,764 Commits 3 Branches 55 Tags
b19cb17bba319cdf3df2f96cbb77b59ffe2ac7ed
Commit Graph

2764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Teeuw b19cb17bba Merge branch 'develop' into newservermode 2019-12-28 19:37:41 +01:00
Michael Teeuw c1e808bce6 Merge pull request #1806 from sdetweil/newElectron 
New electron version
 2019-12-28 19:35:57 +01:00
sam detweiler 5279995c3b Merge branch 'develop' into newservermode 2019-12-13 08:03:06 -06:00
Sam Detweiler ed61ac624d http default if no address is 0.0.0.0, not localhost, hard code localhost as per readme 2019-12-10 12:15:30 -06:00
Sam Detweiler 4da6e3ecee add test for error on 200 rc test path 2019-12-10 11:29:26 -06:00
Sam Detweiler 9e5561936a Merge branch 'newElectron' of https://github.com/sdetweil/MagicMirror into newElectron 2019-12-10 10:54:18 -06:00
Sam Detweiler 843cd0eff6 change spectron version to match doc, update locak file 2019-12-10 10:53:41 -06:00
sam detweiler 6b6ee934a1 Merge branch 'develop' into newElectron 2019-12-10 08:31:50 -06:00
Sam Detweiler aea57ffaf4 add new run_start.sh script 2019-12-10 08:29:18 -06:00
Sam Detweiler 87b48661fa remove forced npm install 2019-12-09 16:41:56 -06:00
Sam Detweiler 556fa44858 move travis to node 10 , latest npm 2019-12-09 16:26:49 -06:00
Sam Detweiler 340d04a48c add changelog entry 2019-12-09 09:52:15 -06:00
Sam Detweiler 63d9904370 regression checking for macOS 2019-11-22 06:30:46 -06:00
Sam Detweiler caaeff5cb7 add support for commented lines in config.js 2019-11-22 06:22:21 -06:00
Sam Detweiler a5bc8dfa3f add package.json to update 2019-11-19 19:50:46 -06:00
Michael Teeuw 73be6c35a6 Merge pull request #1808 from FritzJay/develop 
Use config.decimalSymbol when displaying the predicted amount of rain in weatherforecast
 2019-11-13 08:01:42 +01:00
Fritz Jay 24f74e1400 Fixed spelling error. 2019-11-12 19:30:42 -08:00
Fritz Jay 8900e069f3 Updated changelog 2019-11-12 19:26:38 -08:00
Fritz Jay 1dfec119bb Fixed bug that was causing predicted amount of rain value to use DOT as a decimal separator regardless of the decimalSymbol config value. 2019-11-12 18:16:55 -08:00
Sam Detweiler 9e23d35f01 update elecgtron version 2019-11-08 13:20:39 -08:00
Sam Detweiler cd2b240308 upgrade electron 2019-11-08 11:43:17 -08:00
Michael Teeuw 749f366a4a Merge pull request #1796 from sdetweil/fix-untrack 
Fix untrack-css on MacOS
 2019-10-27 15:27:29 +01:00
Sam Detweiler 420aaa92fa fix for MacOS 2019-10-27 09:14:55 -05:00
Sam Detweiler 985698bbc3 fix for no 'Xorg' process on MacOS 2019-10-27 09:13:44 -05:00
Michael Teeuw f9c9139f20 Merge pull request #1790 from sdetweil/patch-1 
left electron left in dependencies section vs pr 1788
 2019-10-25 16:38:35 +02:00
Michael Teeuw f308e7541f Merge pull request #1791 from sdetweil/newscripts 
New scripts cleanuo
 2019-10-25 16:09:14 +02:00
Sam Detweiler cb7ccd7854 update readme and upgrade script to work from website, fix tabs in config sample 2019-10-25 08:46:41 -05:00
Sam Detweiler a4953028d0 remove electron from dependencies section 2019-10-25 08:13:25 -05:00
sam detweiler 3d6485588d pr merge order left electron in dependencies section 2019-10-25 07:37:21 -05:00
Michael Teeuw 51bb9fede7 Merge pull request #1789 from sdetweil/newscripts 
New scripts for install, update and pm2 config
 2019-10-25 14:26:13 +02:00
Michael Teeuw 269c429959 Merge branch 'develop' into newscripts 2019-10-25 14:25:57 +02:00
Michael Teeuw fcdc84a12a Merge pull request #1788 from sdetweil/newservermode 
New servermode
 2019-10-25 14:24:05 +02:00
Michael Teeuw ecdd9734eb Merge branch 'develop' into newservermode 2019-10-25 14:23:50 +02:00
Michael Teeuw 84fc2c65af Merge pull request #1784 from MichMich/dependabot/npm_and_yarn/nwmatcher-1.4.4 
Bump nwmatcher from 1.4.3 to 1.4.4
 2019-10-25 14:21:31 +02:00
Sam Detweiler c8849a17b6 add detection of xwindows running 2019-10-25 06:22:10 -05:00
Sam Detweiler d8b49218e9 Merge branch 'newscripts' of https://github.com/sdetweil/MagicMirror into newscripts 2019-10-24 22:14:19 -05:00
Sam Detweiler e95023e8cc remove forced arch parm for armv6 to armv7, doesn't work 2019-10-24 22:13:46 -05:00
sam detweiler 878710e2cf Add text for new upgrade script 2019-10-24 14:21:38 -05:00
Sam Detweiler 0677d0a810 add changelog info 2019-10-24 09:36:15 -05:00
Sam Detweiler 9c98fea8f4 add new upgrade/pm2 scripts, update installer script 2019-10-24 09:33:34 -05:00
Sam Detweiler e958f33450 add support for armv6l using serveronlymode, make serveronly config option, electron install optional 2019-10-24 09:20:33 -05:00
sam detweiler 937080b011 Merge pull request #19 from MichMich/master 
catch up to 2.9
 2019-10-24 07:06:53 -05:00
Michael Teeuw aee5803dd2 Merge pull request #1773 from qistoph/timestamp_log 
Timestamp log
 2019-10-23 13:07:06 +02:00
Chris van Marle f1f394b871 Add merge to package-lock to fix Travis fail 2019-10-23 10:44:30 +00:00
Chris van Marle 81a32b56f0 Fix TravisCI error 2019-10-23 10:16:01 +00:00
Chris van Marle a6aae70a55 Add UTC timestamp to console log 2019-10-23 10:16:01 +00:00
dependabot[bot] 823eb23773 Bump nwmatcher from 1.4.3 to 1.4.4 
Bumps [nwmatcher](https://github.com/dperini/nwmatcher) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/dperini/nwmatcher/releases)
- [Commits](https://github.com/dperini/nwmatcher/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-22 17:12:07 +00:00
Michael Teeuw 1ff51822df Prepare 2.10.0-develop 2019-10-01 19:47:40 +02:00
Michael Teeuw 500147e130 Merge pull request #1776 from MichMich/develop 
v2.9.0
v2.9.0 		2019-10-01 19:45:34 +02:00
Michael Teeuw d90de18d99 Prepare 2.9.0 2019-10-01 19:36:51 +02:00