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

155 Commits

Author SHA1 Message Date
ubertao
d3028e10d3 Merge branch 'develop' of https://github.com/MichMich/MagicMirror into pr-calender-gzip 2018-09-12 08:15:52 +08:00
ubertao
044dbd4a65 Add gzip support to calendar fetcher. 2018-09-08 23:05:19 +08:00
vlb
188aa14d82 added support for showing end of events in calendar 2018-08-28 18:11:38 +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
vlb
7ba88a83f0 consider events lasting several full days as full day events 2018-08-28 13:05:06 +02:00
Elan Trybuch
facfa73214
Merge branch 'develop' into rp-zero-w-es6-fix 2018-08-16 12:07:38 -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
Janne Kalliola
c9577bcdc5 Added an if to use absolute dates with all events 2018-08-05 19:47:27 +03:00
Teddy Payet
afd829307d Tabs and spaces from the original files 
With a diff, here the orginal tabulations.
 2018-06-11 23:09:00 +02:00
Teddy Payet
09abdc0f12 ESLint format 
Resolve format ith eslint
 2018-06-11 19:59:21 +02:00
Teddy Payet
ed4d17f578 README updated 
Update of README for the new option.
 2018-06-11 16:41:08 +02:00
Teddy Payet
cbc2eaf908 Customize classes for table 
MagicMirror offers helper classes in the main.css. Therefore, we give
the possibility to indicate the class that we want.
 2018-06-11 12:54:27 +02:00
Kenn Breece
70dccff293 Add regex filtering to calendar module 2018-06-03 21:12:31 -04:00
Michael Teeuw
c4dee3dd8d
Merge pull request #1293 from derRAV3N/patch-1 
Add note to README.md
 2018-05-22 15:27:03 +02:00
derRAV3N
091e024032
Add note to README.md 
Add note to README.md to not add calendars that have entries before 1st January 1970.
 2018-05-22 15:14:05 +02:00
=
c6bf69cce4 fix linting errors. add line to changelog 2018-05-10 19:54:01 -04:00
=
e492012004 fix missing s on timeFormat 2018-05-09 22:36:53 -04:00
=
94c46f9881 New calendar display format with date headers for days and times listed next to events for that date 
IE:

Sunday, May 1st
  2:00 pm       Soccer
  4:00 pm       Basketball
 2018-05-09 22:32:15 -04:00
Parnic
173499f496
Fixed coloredSymbolOnly 2018-05-05 08:31:58 -05:00
Brian Johnson
8053256203 Added option to calendar module that colors only the symbol instead of the whole line 2018-04-27 11:06:45 -05:00
Janne Kalliola
30c5d78647 Support for hiding on-going events 2018-04-08 14:57:28 +03:00
Kenn Breece
96d883c1c7
Merge branch 'develop' into kb/calendar-adv-filter 2018-03-20 15:38:16 -04:00
Kenn Breece
be0f262e37 Add advanced filtering to excludedEvents 2018-03-18 23:54:23 -04:00
Michael Teeuw
22e2fdc707 Jest implementation to get danger.js to work. 2018-01-25 19:43:09 +01:00
reeno
80a9d40a44
fixed width Font Awesome symbols 
See http://fontawesome.io/examples/#fixed-width
 2017-11-25 12:08:40 +01:00
Chris van Marle
664196c5ef Fix some trailing whitespace grunt errors 2017-10-12 10:23:40 +02:00
Andreas Cederström
2d03ff63cf Slice the list of all events to honor config.maximumEntries 
Scenario:
* Specify more than one calendar in `config.calendars`
* Specify a maximum number of entries in `config.maximumEntries`

Result:
The module will show as many as maximumEntries for EACH calendar

Expected:
The module shall not show more than a total of maximumEntries, regardless of how many calendars I specify

Fixes #1043
 2017-10-01 21:47:10 +02:00
Rodrigo Ramírez Norambuena
4bd36fc29e Merge branch 'develop' into deprecation-warning 2017-08-13 04:28:06 -03:00
Bas van Wetten
e0414e4eb9 Add unittest for calendar module 
Add unittest for 'getLocalSpecification' function.
 2017-07-31 22:36:14 +02:00
Michael Teeuw
18b61e35be Merge branch 'develop' into unittest-calendar 2017-07-31 15:04:16 +02:00
Rodrigo Ramírez Norambuena
06af327e5e Added deprecation warning for authentication of the calendar module. 
Discussed in Review
9848f80630 (r105531731)
 2017-07-30 22:56:27 -04:00
Bas van Wetten
35e3b889c3 Add new unit tests 
Add new unit tests for 'shorten' function in calendar module
 2017-07-29 16:02:53 +02:00
Bas van Wetten
b89ee67daf Merge branch 'fix-issue-961' into fix-issue-963 2017-07-28 21:33:10 +02:00
Bas van Wetten
7bd256c311 Fix calendar.js bug issue #963 
Fixed calendar specific configuration settings maximumEntries and maximumNumberOfDays not overriding global setting
 2017-07-28 21:07:38 +02:00
Bas van Wetten
4add7cd0b3 Fix calendar.js bug 
Fix bug where excludedEvents count towards maximumEntries displayed
 2017-07-28 17:47:22 +02:00
Michael Teeuw
c492ea77f1 Merge pull request #943 from QNimbus/fix-issue-940 
Fix issue #940
 2017-07-12 10:55:43 +02:00
Unknown
db0bd3fa2d Fix issue #940 
Fix for issue 940 - time was incorrectly displayed in a 12-hour fashion regardless of the 24 hour clock preference in config.js
 2017-07-09 11:46:59 +02:00
eouia
561ae102fb add symbol and color on broadcasted events 2017-07-06 11:57:16 +02:00
Unknown
3404ebbbb8 Calender respects timeformat 
In reference to issue #776, made changes to calendar.js to respect timeformat config option if it is used
 2017-06-26 14:43:40 +02:00
Veeck
96c338859b More lazy sunday cleanups of missing semicolons, unused vars and other small thins 2017-06-11 11:53:55 +02:00
retroflex
7c80eec755 Merge branch 'develop' into develop 2017-05-02 21:24:36 +02:00
retroflex
07c50c20b6 Spaces -> tabs. 2017-05-02 21:20:35 +02:00
retroflex
ba63a44ec8 Added option to set a separate date format for full day events. 2017-04-28 23:31:07 +02:00
Mikko Tapionlinna
ee88897b18 Add better support for translations with backwards compatibility 2017-04-25 23:15:34 +03:00
Andrew McOlash
154e33a2c3 Make times align to the top of the cell 2017-04-02 15:10:00 -05:00
Andrew McOlash
63ae2b8095 Add in ability to wrap calendar events to multiple lines 2017-04-02 15:06:58 -05:00
Johan Hammar
47c356692f Fix a few more typos 2017-03-30 22:14:11 +02:00
Rodrigo Ramírez Norambuena
0d3c03d1e3 Restore code removed on Merges on 2017-03-17 2017-03-17 22:36:21 -03:00
Michael Teeuw
b4dfce4a44 Merge branch 'fewieden-calendar-multiple-icons' into develop 2017-03-17 15:37:40 +01:00