3446 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Shahrukh Khan	eea8b4dfbf	Update README.md ... Remove extra two "of" words	2020-01-08 18:10:36 +05:00
Karsten Hassel	20a9150ea3	fix run-start.sh: if running in docker-container, just start electron, see #1859	2020-01-03 19:17:50 +01:00
sam detweiler	c51e613568	Merge pull request #34 from MichMich/develop ... sync Develop	2020-01-02 09:31:24 -06:00
Michael Teeuw	69a887fb05	Merge pull request #1851 from ZakarFin/fi-translations ... Add missing translations for fi	2020-01-02 16:16:00 +01:00
Michael Teeuw	01c1d150c6	Merge branch 'develop' into fi-translations	2020-01-02 16:15:47 +01:00
Michael Teeuw	c51c09348e	Merge pull request #1857 from HeikoGr/master ... force declaration of public ip adress in config file (ISSUE #1852)	2020-01-02 16:14:14 +01:00
Michael Teeuw	0a4df191a7	Merge branch 'develop' into master	2020-01-02 16:13:30 +01:00
HeikoGr	760995773e	Update CHANGELOG.md	2020-01-02 16:04:38 +01:00
HeikoGr	94ff8a9b04	force declaration of public ip adress in config file (ISSUE #1852)	2020-01-02 14:15:24 +00:00
Sami Mäkinen	10d5529f79	Add missing translations for fi	2020-01-02 00:04:59 +02:00
Michael Teeuw	2b511b67c3	Prepare for 2.11.0	2020-01-01 22:21:55 +01:00
Michael Teeuw	b595cdd31e	Merge pull request #1850 from MichMich/develop ... Version 2.10.0 v2.10.0	2020-01-01 22:06:34 +01:00
Michael Teeuw	e64870ca58	Prepare 2.10.0 release.	2020-01-01 21:50:02 +01:00
Michael Teeuw	a40f8d5b3a	Merge pull request #1848 from oemel09/fix-calendar-full-multiple-day-events ... Display still ongoing multiple day events as happening today	2020-01-01 21:47:54 +01:00
Michael Teeuw	61b8871ead	Update package lock.	2020-01-01 21:23:25 +01:00
Michael Teeuw	4b5a3ed44d	Downgrade Electron to check Travis.	2020-01-01 21:12:31 +01:00
Michael Teeuw	7d6b7b2691	Reverse tests for debugging.	2020-01-01 21:01:17 +01:00
Michael Teeuw	3dba46b74f	Downgrade test utils.	2020-01-01 20:26:16 +01:00
Michael Teeuw	2767e31a28	Downgrade Spectron	2020-01-01 20:18:48 +01:00
Michael Teeuw	40886bcf08	Remove Snyk	2020-01-01 19:48:10 +01:00
Michael Teeuw	04dde74572	Move and alias node_module.	2020-01-01 19:17:23 +01:00
Michael Teeuw	29f3ac065f	Re-enable weather tests.	2020-01-01 19:03:32 +01:00
Michael Teeuw	d2b30b4f9c	Merge pull request #1849 from roramirez/fix-ci ... Fix CI	2020-01-01 18:59:34 +01:00
Rodrigo Ramírez Norambuena	3a42663dea	Update changelog for revert commit	2019-12-31 19:40:59 +00:00
Rodrigo Ramírez Norambuena	905d0ca409	Update package-lock*	2019-12-31 19:33:21 +00:00
Rodrigo Ramírez Norambuena	7e2c78666e	Revert "stop helper class being erased" ... This reverts commit 2fbedca746655f38fa89a6436afa888f88d518db.	2019-12-31 19:31:13 +00:00
oemel09	6a5f0225fe	Display still ongoing multiple day events as happening today	2019-12-31 13:59:58 +01:00
Michael Teeuw	ddb01fca31	Merge pull request #1847 from oemel09/fix-full-day-events ... Fixes some events not being recognized as full day events	2019-12-31 13:20:18 +01:00
oemel09	684a3cd49e	Fixes some events not being recognized as full day events	2019-12-31 12:37:29 +01:00
Michael Teeuw	ad5e42115b	Merge pull request #1846 from oemel09/fix-calendar-debug ... Fixes authentication in calendar debug script	2019-12-31 11:31:09 +01:00
oemel09	2d6b8d0c47	Fixes authentication in calendar debug script	2019-12-31 11:27:15 +01:00
Michael Teeuw	61471e5449	Merge pull request #1844 from RGMTAMU/minorREADMEFix ... Very minor README spelling error fix	2019-12-30 14:34:15 +01:00
Shiva	b6f7ab7a9c	Very minor README spelling error fix	2019-12-29 16:38:47 -06:00
Michael Teeuw	2d061be98e	Fix corrupted file.	2019-12-29 15:12:50 +01:00
Michael Teeuw	d6e97b8c76	Cleanup.	2019-12-29 14:52:26 +01:00
Michael Teeuw	9e44660746	Merge pull request #1841 from MichMich/skip-weather-tests ... Skip weather tests.	2019-12-29 14:37:31 +01:00
Michael Teeuw	03e6ca58ab	Link to issue.	2019-12-29 14:34:07 +01:00
sam detweiler	e884cc1f75	Merge pull request #32 from MichMich/develop ... sync Develop	2019-12-29 07:33:57 -06:00
Michael Teeuw	94c63b0554	Skipping weather tests for now.	2019-12-29 14:30:12 +01:00
Michael Teeuw	c7c8c40a70	disable test	2019-12-29 13:56:53 +01:00
Michael Teeuw	91c726c706	Merge branch 'pr/SpencerCornish/1834' into develop	2019-12-29 13:51:18 +01:00
Michael Teeuw	c9805e7ac9	Updated package.lock files.	2019-12-29 13:47:05 +01:00
Michael Teeuw	a4db0e40e3	Merge pull request #1815 from sdetweil/newservermode ... fix regression and add support for commented lines in config.js	2019-12-29 00:01:23 +01:00
Michael Teeuw	305b55cb2a	Merge pull request #1814 from sdetweil/newscripts ... updates for libc6++ on pi 0, node 10	2019-12-29 00:00:03 +01:00
Sam Detweiler	272ca1ac4f	synch package-lock.json for testing	2019-12-28 15:46:10 -06:00
Sam Detweiler	bbc6a1b38f	synch package-lock for testing	2019-12-28 15:39:57 -06:00
sam detweiler	525c235d3b	Merge pull request #31 from MichMich/develop ... synch to Develop	2019-12-28 15:01:54 -06:00
Michael Teeuw	0e93713464	Merge pull request #1826 from sdetweil/fixcompliments ... Fix compliments to support \n	2019-12-28 22:01:16 +01:00
sam detweiler	8f60e103f9	Merge branch 'develop' into fixcompliments	2019-12-28 14:58:01 -06:00
Michael Teeuw	9cc702241d	Merge pull request #1827 from sdetweil/fix_helper ... Fix helper being erased accidentally	2019-12-28 21:44:10 +01:00