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
2,367 Commits 3 Branches 49 Tags
Commit Graph

2367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ubertao
d76c924ad1 Update compliments README.md for multi-line support. 2018-09-20 09:09:06 +08:00
ubertao
cad7debc5b Replace innerHTML() with createElement() and appendChild() for security. 2018-09-20 08:49:17 +08:00
ubertao
40725aa2a2 Update CHANGELOG.md with multi-line compliments support. 2018-09-17 00:54:01 +08:00
ubertao
6034891fed Support multi-line compliments. 2018-09-17 00:51:37 +08:00
Michael Teeuw
9dd9862d33
Merge pull request #1402 from ubertao/pr-zh-cn-2.5.0 
Update zh-cn translation for 2.5.0
 2018-09-13 08:59:57 +02:00
Michael Teeuw
48c72e319b
Merge pull request #1401 from ubertao/pr-calender-gzip 
Pr calender gzip
 2018-09-13 08:58:13 +02:00
ubertao
4b6208fd9c Update CHANGELOG.md for zh-cn translation updates. 2018-09-12 09:35:58 +08:00
ubertao
168904a159 Update zh-cn translation to 2.5.0 2018-09-12 09:31:46 +08:00
ubertao
28f1498ec3 update CHANGELOG.md adding gzip fix for calendar module 2018-09-12 08:17:10 +08:00
ubertao
d3028e10d3 Merge branch 'develop' of https://github.com/MichMich/MagicMirror into pr-calender-gzip 2018-09-12 08:15:52 +08:00
Teddy Payet
5eb0b77a8a Merge upstream/develop 2018-09-08 23:40:39 +02:00
ubertao
4aace5b95a update changelog with gzip calendar fix 2018-09-08 23:44:12 +08:00
ubertao
044dbd4a65 Add gzip support to calendar fetcher. 2018-09-08 23:05:19 +08:00
Michael Teeuw
5dbae7c9d7
Merge pull request #1383 from balassy/bugfix/updatenotification-localization 
Making the word "commit" localizable in the UpdateNotification module message
 2018-09-05 09:12:04 +02:00
György Balássy
ec44cb2761 CHANGED: The wording in CHANGELOG is modified to be more descriptive. 2018-09-05 04:41:09 +02:00
György Balássy
b06cf55c0b FIXED: Character encoding issue in pl.json occurred during rebase. 2018-09-05 04:33:42 +02:00
György Balássy
b601f6a138 CHANGED: The UPDATE_INFO key in the localization file is changed to UPDATE_INFO_SINGLE and UPDATE_INFO_MULTIPLE to allow different localization for single and multiple commits. 2018-09-05 04:30:57 +02:00
György Balássy
ddebc63488 ADDED: CHANGELOG entry. 2018-09-05 04:30:23 +02:00
György Balássy
35440822be CHANGED: The COMMIT_COUNT placeholder in the UPDATE_INFO message of the UpdateNotification module does not contain the word "commit" or "commits" any more, so language files can independently localize them. 2018-09-05 04:30:22 +02:00
György Balássy
f4c6bcfb8e
Merge pull request #4 from MichMich/develop 
Update Develop from the original repo
 2018-09-05 04:26:13 +02:00
Michael Teeuw
6365c5c9ef
Merge pull request #1396 from matt08/patch-4 
Updated Polish translation
 2018-09-04 11:42:16 +02:00
matt08
dd0334d30d
Update pl.json 2018-08-31 09:24:18 +02:00
matt08
c462a44973
Polish translate for "Feels" 2018-08-31 09:17:04 +02:00
Michael Teeuw
6f88f5db83
Merge pull request #1385 from el97/patch-4 
Update sv.json
 2018-08-31 09:14:33 +02:00
matt08
93617f62a2
Updating "feels" translation 2018-08-31 09:14:16 +02:00
György Balássy
61d5f39408
Merge pull request #3 from MichMich/develop 
Update the develop branch from the original repository
 2018-08-30 00:00:56 +02:00
Michael Teeuw
c1fddaa7dd
Merge pull request #1392 from vlebourl/develop 
support for showing the end time of non full day events and the end date of several day long
 2018-08-29 09:12:02 +02:00
vlb
188aa14d82 added support for showing end of events in calendar 2018-08-28 18:11:38 +02:00
Vincent Le Bourlot
5c25dd5b6d
Update CHANGELOG.md 2018-08-28 18:00:13 +02:00
vlb
7c579cf7b7 added support for showing end of events through config parameters showEnd and dateEndFormat 2018-08-28 17:35:53 +02:00
vlb
c755c823fa added support for events having a duration instead of an end 2018-08-28 17:29:42 +02:00
Michael Teeuw
116588c237
Merge pull request #1390 from ccrlawrence/patch-1 
ClientOnly: Global variable name used in callback function
 2018-08-28 15:37:55 +02:00
Michael Teeuw
f02c1e4dc7
Merge branch 'develop' into patch-1 2018-08-28 15:36:58 +02:00
Michael Teeuw
c4e8cc1641
Correct changelog entry. 2018-08-28 15:33:53 +02:00
Michael Teeuw
93e68ad147
Merge branch 'develop' into patch-1 2018-08-28 15:32:47 +02:00
vlb
7ba88a83f0 consider events lasting several full days as full day events 2018-08-28 13:05:06 +02:00
ccrlawrence
c9293327ce
Update CHANGELOG.md 2018-08-26 16:01:41 +01:00
ccrlawrence
fa1f35a89e
ClientOnly: Global variable name used in callback function. 
The global 'config' variable is used in the callback function, changed to local one. Unwanted behaviour when accessing server on docker or if using 0.0.0.0 or blank address in config file as it just passes this to electron to display.
 2018-08-26 15:53:01 +01:00
Michael Teeuw
845ce7a711
Merge pull request #1384 from YangVincent/develop 
Update OpenWeather city list instructions
 2018-08-21 16:31:08 +02:00
el97
2b40007563
Update sv.json 
Small changes. Added "FEELS": "Känns som".
 2018-08-21 15:29:20 +02:00
Vincent Yang
217034c4a7
Update Changelog for weather city link 2018-08-21 01:06:12 -07:00
Vincent Yang
0b9d4f17ab
Fix link for finding cities in OpenWeather 2018-08-21 01:04:58 -07:00
Michael Teeuw
7fb0ec12dd
Merge pull request #1381 from Elaniobro/rp-zero-w-es6-fix 
RaspBerry Pi Zero W default calendar module fix
 2018-08-17 12:18:31 +02:00
György Balássy
3581158a7b
Merge pull request #2 from MichMich/develop 
Update Develop from original repo
 2018-08-17 06:40:54 +02:00
Elan Trybuch
facfa73214
Merge branch 'develop' into rp-zero-w-es6-fix 2018-08-16 12:07:38 -04:00
Elan Trybuch
0ef4a86d42 Add patch note to CHANGELOG.md 2018-08-16 11:51:10 -04:00
Elan Trybuch
d4ec4795c3 Fix ES6 syntax bug on RaspberryPi Zero W 
Following this issue https://github.com/MichMich/MagicMirror/issues/694 it seems that the Midori Browser does not recoginize ES6 syntax. Further, the use of 'var' is seen throughout the calendar module excpet on line 439, where the error is reported
 2018-08-16 11:45:34 -04:00
Michael Teeuw
b13d0aa283
Merge pull request #1373 from jannekalliola/develop 
Calendar: Absolute dates do not show absolute even if getRelative and urgency are set to zero
 2018-08-16 12:05:22 +02:00
Michael Teeuw
a6965342e7
Update CHANGELOG.md 2018-08-16 12:00:06 +02:00
Michael Teeuw
752dfa5b7f
Merge pull request #1369 from heskja/patch-2 
Patch 2
 2018-08-16 11:56:03 +02:00