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

75 Commits

Author SHA1 Message Date
Veeck
81244d961e
Update config sample and collab doc (#3039) 
removing some old example and add info about the mastermerge label

---------

Co-authored-by: veeck <michael@veeck.de>
 2023-02-17 19:49:36 +01:00
Karsten Hassel
a65ee86501
Introduce envsubst for config.js, update deps (#3032) 
This is the implemenation of envsubst discussed in #1756 

Documentation update will follow after merge.
 2023-02-12 22:34:57 +01:00
Kristjan SCHMIDT
6f27e5ae07 MagicMirror -> MagicMirror² 2022-01-26 23:47:51 +01:00
Kristjan SCHMIDT
a5668b1b99 Magic Mirror -> MagicMirror² 
Consistent spelling
 2022-01-26 23:09:26 +01:00
Jordan Welch
5463183e01 Update config introduction to active URL. 2022-01-12 20:35:25 -06:00
rejas
f3274977f5 Ignore config dir 2021-09-11 11:55:51 +02:00
rejas
d5ab3101c6 Update links to config documentation 2021-05-29 16:23:41 +02:00
rejas
7accb84eb9 Use es6 notation in config sample 2021-04-18 15:06:28 +02:00
Felix Wiedenbach
e2b4823e43 added locale to sample config 2021-02-16 22:06:53 +01:00
buxxi
0683734d5a Make a sane default for weatherEndpoint based on the type 2021-01-24 10:32:43 +01:00
buxxi
948b6c8de8 deprecate module currentweather and weatherforecast 2021-01-23 13:12:56 +01:00
Michael Teeuw
c1d35b0f91
Merge pull request #2384 from rejas/log_level_sample 
Update config sample
 2020-12-29 16:23:39 +01:00
rejas
7802e0bb88 Set locationID everywhere on config sample 2020-12-29 10:23:12 +01:00
rejas
07e75b8550 Adjust log level in sample 2020-12-29 10:21:50 +01:00
buxxi
a50824eeee Merging config/.gitignore with .gitignore 2020-12-28 11:50:01 +01:00
veeck
5ac20d65ac Add new log level "debug" for such a purpose 2020-11-06 11:47:09 +01:00
Veeck
d0c6a4ee6d Make logger configurable 2020-06-02 15:03:59 +02:00
rejas
e7fc4ef1e7 Replace unsecure links with https ones 2020-04-28 23:05:28 +02:00
rejas
941d5d7cd9 Fix mixed tabs and whitespace errors 2020-04-21 12:23:50 +02:00
Leon Kiefer
e6c0011789 renamed basename to basePath 2020-04-06 21:29:55 +02:00
Leon Kiefer
54542f7f07 added basename config 
use basename in socket.io path fix #1973
 2020-04-05 23:00:38 +02:00
rejas
5a4ae99283 Add no-multi-spaces rule to eslint and run it 2020-03-15 15:49:34 +01:00
rejas
5517a913d4 Run linter manually 2020-03-08 16:20:54 +01:00
karenorman
5511c15921 Update description in config.js.sample 2020-02-05 10:23:49 +08:00
karenorman
c8c327b6ab Add HTTPS support 2020-02-01 20:46:26 +08: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
Kurtis Blankenship
2b738fa14b Merge branch 'develop' of github.com:MichMich/MagicMirror into fix-timeshift-calendar 2020-01-17 22:54:59 -06:00
Kurtis Blankenship
8aa745471b fix: Issue #1798 - fixing recurrent calendar events crosstime DST 2020-01-17 22:53:14 -06:00
HeikoGr
94ff8a9b04 force declaration of public ip adress in config file (ISSUE #1852) 2020-01-02 14:15:24 +00: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
e958f33450 add support for armv6l using serveronlymode, make serveronly config option, electron install optional 2019-10-24 09:20:33 -05:00
Charles Dyason
c7d79bb893 Updated config.js.sample with new configuration entries 
Added `broadcastNewsFeeds: true` and `broadcastNewsUpdates: true` to the `config.js.sample` file
 2019-05-31 19:45:58 +02:00
vincep5
7240fb32d2 update city list url 2019-05-14 15:00:30 -05:00
kevbodavidson
20b75ce6ed Update config.js.sample 2019-05-07 20:04:55 +02:00
Michael Teeuw
cecc6f7561
Merge branch 'develop' into develop 2018-10-26 15:11:46 +02:00
cphamlet
9b6ba65cdb
Fix Broken Link 
http://www.openweathermap.org/help/city_list.txt is a dead link, suggest replacing with https://openweathermap.org/city
 2018-10-14 15:08:55 -05:00
P-DESK\P-Storm
fc89feec4e * Added font awesome 5, keeping shims in place for the calendar app (https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4) 
* Updated example sample config
 2018-10-05 01:16:25 +02:00
Vincent Yang
0b9d4f17ab
Fix link for finding cities in OpenWeather 2018-08-21 01:04:58 -07:00
Chris van Marle
d99897cf9d Update sample address 
As proposed in review
 2017-09-06 15:22:17 +02:00
Chris van Marle
a518d3f33f Describe default in comment of sample config 2017-09-01 14:46:25 +02:00
Chris van Marle
2f05228d91 More secure defaults. 
Without config, listen only on looback interface. In sample config
listen on any interface, but use an IP whitelist.

Related to #950
 2017-09-01 14:46:25 +02:00
Unknown
66f93ee541 Added clientonly script 
Added clientonly script to have server and client run at different locations
 2017-07-02 12:10:16 +02:00
Michael Teeuw
a8e18d7f99 Merge pull request #830 from roramirez/format-tab-config.sample 
Fix extra tabs added in config.js.sample
 2017-04-06 16:24:29 +02:00
Rodrigo Ramírez Norambuena
c798913fd2 Fix extra tabs added in config.js.sample 2017-04-03 15:18:35 -03:00
Rodrigo Ramírez Norambuena
ab28d0e09f Add note about how configurate the file into config.js.sample 2017-04-03 11:28:46 -03:00
Doug Kline
4a70e3cd31 Update config.js.sample 2017-04-01 18:54:28 -04:00
Doug Kline
5ccf053cba TL;RL cheat notes for IPv4 ipWhitelist 
Hopefully save a google or support request --  while still using IPv4 addresses on MagicMirror network, need to set full address by using ::ffff: as prefix to IP in config.  e.g.  ::ffff:192.168.5.1 and not 192.168.5.1
 2017-04-01 17:23:24 -04:00
Michael Teeuw
bfb376505b Merge pull request #759 from roramirez/readme-ipWhitelist 
Add note to allow all IP addresses. ipWhitelist configuration directive.
 2017-03-17 14:10:24 +01:00
BeatIdo
50f2dded64 Complete OWM city list URL 2017-03-10 16:42:43 +01:00
Rodrigo Ramírez Norambuena
34f04b1946 Add note to allow all IP addresses. ipWhitelist configuration directive. 2017-03-09 17:26:50 -03:00