984 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Olexandr Savchuk	15c5725829	Merge branch 'develop' into electron-zoom-factor	2016-12-08 15:54:52 +01:00
Michael Teeuw	96653170a2	Merge pull request #551 from olexs/round-temps ... Option to display temperatures rounded to nearest integer	2016-12-08 15:47:44 +01:00
Michael Teeuw	eade89da48	Merge pull request #555 from qistoph/remoteonly ... Check updates (in updatenotification) only for repos with remote	2016-12-08 15:29:17 +01:00
Rodrigo Ramírez Norambuena	9b86049964	newsfeed, calendar: Standardize user-agent. ... Add node and MagicMirror version.	2016-12-08 01:29:55 -03:00
Rodrigo Ramírez Norambuena	9e2bbd50b6	README compliments: Close code tag and fix tabs	2016-12-07 22:03:32 -03:00
Chris van Marle	0d18266ad1	Fetch remote git only if repo has a remote	2016-12-07 08:38:45 +01:00
Rodrigo Ramírez Norambuena	83ee0534f2	fixed eslint error into modules for Javascript files	2016-12-02 23:23:54 -03:00
Rodrigo Ramírez Norambuena	8ad00025ad	use Gruntfile into modules/default/*	2016-12-02 23:23:48 -03:00
Olexandr Savchuk	7d08a7c9cd	Added documentation and changelog entry.	2016-12-02 21:14:41 +01:00
Olexandr Savchuk	c8d5a5319e	Clean up duplicate code in Electron options	2016-12-02 21:09:16 +01:00
Olexandr Savchuk	a08fa721cf	Added zoom factor config value and Electron option	2016-12-02 21:05:36 +01:00
Olexandr Savchuk	89bc3137ba	Fixed method description.	2016-12-02 20:56:10 +01:00
Olexandr Savchuk	4d8d30f897	Moved misplaced method signature	2016-12-02 20:53:02 +01:00
Olexandr Savchuk	d67e9468c0	Changed roundTemp implementation to a cleaner one	2016-12-02 20:52:36 +01:00
Olexandr Savchuk	7dda36ab97	Merge branch 'round-temps' of github.com:olexs/MagicMirror into round-temps	2016-12-02 17:38:04 +01:00
Olexandr Savchuk	32df3e80b1	Renamed roundTemperature option to roundTemp ... Added changelog entry	2016-12-02 17:33:41 +01:00
Olexandr Savchuk	3c33969d23	implemented roundTemperature in weather modules	2016-12-02 17:27:45 +01:00
Olexandr Savchuk	c2aec5ae36	implemented roundTemperature in weather modules	2016-12-02 17:17:58 +01:00
Michael Teeuw	c949548150	Merge pull request #546 from BrianHepler/load_compliments_from_remote_file ... Load compliments from remote file	2016-11-30 16:43:14 +01:00
Brian	829ccfca88	Updated changelog and compliments documentation.	2016-11-30 10:31:19 -05:00
Brian	950fa84d1c	Added capability to load compliments from the host file system.	2016-11-30 10:30:49 -05:00
Michael Teeuw	5666729fcf	Merge pull request #543 from roramirez/pulled-clock ... clock: remove statement of repetead code.	2016-11-29 10:41:29 +01:00
Michael Teeuw	3a13886af9	Merge pull request #542 from aschulz90/mm-fixes ... Fixed Global Default Config Being Modified	2016-11-26 16:17:14 +01:00
Rodrigo Ramírez Norambuena	db6e0ccf63	clock: remove statement of repetead code.	2016-11-26 11:45:12 -03:00
Andreas	35f2ebc2aa	Fixed Global Default Config Being Modified	2016-11-26 15:33:10 +01:00
Michael Teeuw	60ac4a3e86	Merge pull request #541 from roramirez/bind-address ... Add option to set bind address	2016-11-26 13:23:27 +01:00
Rodrigo Ramírez Norambuena	c966d34b07	fix camelCase detected eslint	2016-11-25 21:55:51 -03:00
Rodrigo Ramírez Norambuena	a05d7059fb	Update CHANGELOG	2016-11-25 21:54:03 -03:00
Rodrigo Ramírez Norambuena	facc1dc944	add label where is bind serveronly	2016-11-25 21:48:36 -03:00
Rodrigo Ramírez Norambuena	df2ebbf384	Add option to set bind address	2016-11-25 21:41:05 -03:00
Michael Teeuw	e210471c7a	Merge pull request #539 from roramirez/fix_tab_config.js_sample ... fix tab into config.js.sample	2016-11-24 15:48:03 +01:00
Michael Teeuw	f42d552dad	Merge pull request #540 from roramirez/space_comment_js_main ... fix comments and space js/main.js	2016-11-24 15:47:49 +01:00
Rodrigo Ramírez Norambuena	edfd9e46b6	fix comments and space js/main.js	2016-11-24 00:26:40 -03:00
Rodrigo Ramírez Norambuena	27644776f3	fix tab into config.js.sample	2016-11-24 00:20:04 -03:00
Michael Teeuw	a4797dcc73	Merge pull request #537 from roramirez/comment-fix ... comments fix for js/module.js	2016-11-22 23:09:35 +01:00
Rodrigo Ramírez Norambuena	677312648b	comments fix for js/module.js	2016-11-22 18:53:46 -03:00