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

1024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodrigo Ramírez Norambuena
49abe2b11f Fix capitalize missing word Community 2017-01-10 16:11:29 -03:00
Michael Teeuw
b9e7f018e2 Merge pull request #607 from qistoph/fixdefmod 
Fix gitignore to not ignore default modules folder
 2017-01-10 19:54:02 +01:00
Michael Teeuw
f31049cf69 Merge branch 'develop' into fixdefmod 2017-01-10 19:52:20 +01:00
Michael Teeuw
2b3b73b3f1 Merge pull request #600 from roramirez/config_sample-installer 
modified installer to use config.js.sample for init config.
 2017-01-10 19:46:38 +01:00
Michael Teeuw
704bb5a848 Merge pull request #597 from roramirez/fix-white-flash-boot 
Remove white flash on boot up
 2017-01-10 19:44:01 +01:00
Michael Teeuw
01f7d7add2 Merge pull request #608 from roramirez/new_year 
update year license for 2017
 2017-01-10 19:34:55 +01:00
Rodrigo Ramírez Norambuena
831d8b6d36 update year license for 2017 2017-01-10 15:22:10 -03:00
Chris van Marle
2e9b6ead2e Fix gitignore to not ignore default modules folder 
/modules/** makes git ignore all directories and files in /modules, so
it's not even looking in /modules/default for changes.
!/modules/default/** is therefore never used. By adding the new line
!/modules/default, git is told to look in the /modules/default folder
for changes and will find all sub files/dirs and match these on
!/modules/default/**.
 2017-01-10 11:31:00 +01:00
Rodrigo Ramírez Norambuena
396bbd83c8 modified installer to use config.js.sample for init config. 2017-01-05 16:09:41 -03:00
Rodrigo Ramez Norambuena
6552157894 Remove white flash on boot up 
When the electron app is started appear a white flash before show the
MagicMirror system.

This patch remove the white flash on boot up.
 2017-01-04 13:06:24 -03:00
Michael Teeuw
8ac8b666bf Update CHANGELOG.md 2017-01-04 08:59:37 +01:00
Michael Teeuw
095feddf73 Merge pull request #591 from qistoph/modloaded 
Update CHANGELOG for the async loaded function
 2017-01-04 08:58:53 +01:00
Chris van Marle
4882a801d2 Update CHANGELOG 2017-01-03 17:46:41 +01:00
Michael Teeuw
1a1736ca0e Merge pull request #588 from brosy/handle-newsfeed-errors 
Add error handling to newsfeed
 2017-01-03 11:43:26 +01:00
Ben Brosnahan
a7619771a6 Add error handling to newsfeed 2017-01-02 21:35:53 +00:00
Michael Teeuw
6febcf3b94 Merge pull request #556 from qistoph/modloaded 
Add async callback to module when loaded
 2017-01-02 13:37:16 +01:00
Chris van Marle
3947deb7bd Add async callback to module when loaded 2017-01-02 13:04:15 +01:00
Michael Teeuw
98855de71f Changes in preperation of 2.1.1 2016-12-31 21:25:49 +01:00
Michael Teeuw
09e6a6a4ad Merge branch 'master' into develop 2016-12-31 21:16:09 +01:00
Michael Teeuw
da772e6649 Add release date. 2016-12-31 21:12:53 +01:00
Michael Teeuw
65b8f78ca1 Merge pull request #579 from brosy/handle-newsfeed-errors 
Add error handling to newsfeed
 2016-12-31 19:13:01 +01:00
Michael Teeuw
23bcac2e55 Merge pull request #585 from roramirez/extra-spaces 
fix tabs, remove extra spaces and lines.
 2016-12-31 19:12:24 +01:00
Michael Teeuw
e6a88eef35 Merge pull request #584 from roramirez/js-use-root-path 
global.root_path for js core
 2016-12-31 19:11:21 +01:00
Michael Teeuw
6654c461a6 Merge pull request #582 from henglert/patch-1 
Fix repeating count of yearly calendar events
 2016-12-31 19:10:21 +01:00
Rodrigo Ramírez Norambuena
a48cb052c2 resolv some missing fix eslint rules no-trailing-spaces 2016-12-30 17:47:33 -03:00
Rodrigo Ramírez Norambuena
809d932087 add rules "no-trailing-spaces" and "no-irregular-whitespace" for ESLint 2016-12-30 17:44:41 -03:00
Rodrigo Ramírez Norambuena
19d906c5e4 fix tabs, remove extra spaces and lines. 2016-12-29 22:23:08 -03:00
Rodrigo Ramírez Norambuena
2f933a90fd global.root_path for js core 
Use global.root_path instead of "/../" syntax to go back directory
 2016-12-29 19:09:28 -03:00
henglert
3607875714 Fix repeating count of yearly calendar events 
The occurrence counter for a yearly repeating event e was calculated by "current year" - "e.firstYear", instead of "e.year" - "e.firstYear". That leads to a repeating event counter - 1 at the end of the year. E.g.
event e: first Date: 2015-01-02, yearly repetition
repeating count evaluated on 2015-12-31: 2015-2015 = 0 => incorrect
repeating count evaluated on 2016-01-01: 2016-2015 = 1 => correct
Fix: repeating count has to be calculated from event date instead of current date.
 2016-12-29 15:31:01 +01:00
Michael Teeuw
fec8829041 Merge pull request #580 from roramirez/root_path 
global: Add the root_path variable in global.
 2016-12-28 13:33:47 +01:00
Rodrigo Ramírez Norambuena
f58e758a41 global: Add the root_path variable in global. 
This will can be help for work the better way in use the path into
the core and modules.
 2016-12-27 14:31:35 -03:00
Ben Brosnahan
cebed0824f Fix lint error 2016-12-26 11:35:37 +00:00
Ben Brosnahan
97120bd1f1 Add error handling to newsfeed 2016-12-26 01:17:45 +00:00
Michael Teeuw
4237d0c7e3 Merge pull request #547 from dbahn25/hidePrivate 
Hide private
 2016-12-24 14:23:47 +01:00
Daniel Buecheler
243cdfefa2 Fix failed linter test 2016-12-22 22:00:59 +01:00
Daniel Buecheler
a12a4cd8f2 Merge remote-tracking branch 'mich/develop' into hidePrivate 
Resolved merge conflict
 2016-12-22 21:53:47 +01:00
Michael Teeuw
989dca5792 Merge pull request #563 from aschulz90/mm-fixes 
Mm fixes
 2016-12-14 10:05:20 +01:00
Michael Teeuw
c9eb06bb70 Merge pull request #560 from berlincount/develop 
make electronOptions configurable
 2016-12-14 10:04:27 +01:00
Michael Teeuw
af89906b81 Merge pull request #559 from roramirez/user-agent 
newsfeed, calendar: Standardize user-agent.
 2016-12-14 10:03:31 +01:00
Andreas
de71b1b397 Revert calendar default value and add documentation 2016-12-13 17:16:46 +01:00
Rodrigo Ramírez Norambuena
2decee1d87 Merge branch 'develop' into user-agent fix conflict. 2016-12-13 10:40:10 -03:00
Andreas 'count' Kotes
6a184b069b make electronOptions configurable, remove kioskmode from documentation 2016-12-13 13:59:24 +01:00
Michael Teeuw
48db615ac8 Merge pull request #553 from roramirez/grunt-eslint-modules 
Grunt eslint modules
 2016-12-13 12:58:43 +01:00
Michael Teeuw
bb9caa4838 Merge pull request #566 from roramirez/flag-plymouth 
splashscreen: remove flag not used into script plymouth
 2016-12-13 12:49:53 +01:00
Rodrigo Ramírez Norambuena
3c11c3fc16 splashscreen: remove flag not used into script plymouth 2016-12-13 00:33:29 -03:00
Andreas
6c1dbc5e61 Updated module READMEs with current default values 2016-12-12 14:55:07 +01:00
Andreas
21bf1dd1a3 Updated module READMEs with current default values 2016-12-12 14:52:00 +01:00
Michael Teeuw
78aa2b491c Merge pull request #558 from roramirez/size-for-compliments-text 
Size for compliments text
 2016-12-09 14:54:29 +01:00
Rodrigo Ramírez Norambuena
53d2c7e89f compliments: add abilty to set classes for compliments module 2016-12-09 10:49:49 -03:00
Michael Teeuw
cdf78db629 Merge pull request #552 from olexs/electron-zoom-factor 
Option to scale the whole display using Electron's zoom factor
 2016-12-08 15:57:47 +01:00