Commit Graph

  • 0afe403057 Merge pull request #1861 from khassel/develop Michael Teeuw 2020-01-08 16:25:57 +01:00
  • d500353722 Merge pull request #1871 from shahrukh-alizai/patch-1 Michael Teeuw 2020-01-08 16:24:29 +01:00
  • eea8b4dfbf Update README.md Shahrukh Khan 2020-01-08 18:10:36 +05:00
  • 20a9150ea3 fix run-start.sh: if running in docker-container, just start electron, see #1859 Karsten Hassel 2020-01-03 19:12:02 +01:00
  • c51e613568 Merge pull request #34 from MichMich/develop sam detweiler 2020-01-02 09:31:24 -06:00
  • 69a887fb05 Merge pull request #1851 from ZakarFin/fi-translations Michael Teeuw 2020-01-02 16:16:00 +01:00
  • 01c1d150c6 Merge branch 'develop' into fi-translations Michael Teeuw 2020-01-02 16:15:47 +01:00
  • c51c09348e Merge pull request #1857 from HeikoGr/master Michael Teeuw 2020-01-02 16:14:14 +01:00
  • 0a4df191a7 Merge branch 'develop' into master Michael Teeuw 2020-01-02 16:13:30 +01:00
  • 760995773e Update CHANGELOG.md HeikoGr 2020-01-02 16:04:38 +01:00
  • 94ff8a9b04 force declaration of public ip adress in config file (ISSUE #1852) HeikoGr 2020-01-02 14:15:24 +00:00
  • 10d5529f79 Add missing translations for fi Sami Mäkinen 2020-01-02 00:04:59 +02:00
  • 2b511b67c3 Prepare for 2.11.0 Michael Teeuw 2020-01-01 22:21:55 +01:00
  • b595cdd31e Merge pull request #1850 from MichMich/develop v2.10.0 Michael Teeuw 2020-01-01 22:06:34 +01:00
  • e64870ca58 Prepare 2.10.0 release. Michael Teeuw 2020-01-01 21:50:02 +01:00
  • a40f8d5b3a Merge pull request #1848 from oemel09/fix-calendar-full-multiple-day-events Michael Teeuw 2020-01-01 21:47:54 +01:00
  • 61b8871ead Update package lock. Michael Teeuw 2020-01-01 21:23:25 +01:00
  • 4b5a3ed44d Downgrade Electron to check Travis. Michael Teeuw 2020-01-01 21:12:31 +01:00
  • 7d6b7b2691 Reverse tests for debugging. Michael Teeuw 2020-01-01 21:01:17 +01:00
  • 3dba46b74f Downgrade test utils. Michael Teeuw 2020-01-01 20:26:16 +01:00
  • 2767e31a28 Downgrade Spectron Michael Teeuw 2020-01-01 20:18:48 +01:00
  • 40886bcf08 Remove Snyk Michael Teeuw 2020-01-01 19:48:10 +01:00
  • 04dde74572 Move and alias node_module. Michael Teeuw 2020-01-01 19:17:23 +01:00
  • 29f3ac065f Re-enable weather tests. Michael Teeuw 2020-01-01 19:03:32 +01:00
  • d2b30b4f9c Merge pull request #1849 from roramirez/fix-ci Michael Teeuw 2020-01-01 18:59:34 +01:00
  • 3a42663dea Update changelog for revert commit Rodrigo Ramírez Norambuena 2019-12-31 19:40:31 +00:00
  • 905d0ca409 Update package-lock* Rodrigo Ramírez Norambuena 2019-12-31 19:33:21 +00:00
  • 7e2c78666e Revert "stop helper class being erased" Rodrigo Ramírez Norambuena 2019-12-31 19:31:13 +00:00
  • 6a5f0225fe Display still ongoing multiple day events as happening today oemel09 2019-12-31 13:59:58 +01:00
  • ddb01fca31 Merge pull request #1847 from oemel09/fix-full-day-events Michael Teeuw 2019-12-31 13:20:18 +01:00
  • 684a3cd49e Fixes some events not being recognized as full day events oemel09 2019-12-31 12:37:29 +01:00
  • ad5e42115b Merge pull request #1846 from oemel09/fix-calendar-debug Michael Teeuw 2019-12-31 11:31:09 +01:00
  • 2d6b8d0c47 Fixes authentication in calendar debug script oemel09 2019-12-31 11:19:30 +01:00
  • 61471e5449 Merge pull request #1844 from RGMTAMU/minorREADMEFix Michael Teeuw 2019-12-30 14:34:15 +01:00
  • b6f7ab7a9c Very minor README spelling error fix Shiva 2019-12-29 16:38:47 -06:00
  • 2d061be98e Fix corrupted file. Michael Teeuw 2019-12-29 15:12:50 +01:00
  • d6e97b8c76 Cleanup. Michael Teeuw 2019-12-29 14:52:26 +01:00
  • 9e44660746 Merge pull request #1841 from MichMich/skip-weather-tests Michael Teeuw 2019-12-29 14:37:31 +01:00
  • 03e6ca58ab Link to issue. Michael Teeuw 2019-12-29 14:34:07 +01:00
  • e884cc1f75 Merge pull request #32 from MichMich/develop sam detweiler 2019-12-29 07:33:57 -06:00
  • 94c63b0554 Skipping weather tests for now. Michael Teeuw 2019-12-29 14:30:12 +01:00
  • c7c8c40a70 disable test Michael Teeuw 2019-12-29 13:56:53 +01:00
  • 91c726c706 Merge branch 'pr/SpencerCornish/1834' into develop Michael Teeuw 2019-12-29 13:51:18 +01:00
  • c9805e7ac9 Updated package.lock files. Michael Teeuw 2019-12-29 13:47:05 +01:00
  • a4db0e40e3 Merge pull request #1815 from sdetweil/newservermode Michael Teeuw 2019-12-29 00:01:23 +01:00
  • 305b55cb2a Merge pull request #1814 from sdetweil/newscripts Michael Teeuw 2019-12-29 00:00:03 +01:00
  • 272ca1ac4f synch package-lock.json for testing Sam Detweiler 2019-12-28 15:46:10 -06:00
  • bbc6a1b38f synch package-lock for testing Sam Detweiler 2019-12-28 15:39:57 -06:00
  • 525c235d3b Merge pull request #31 from MichMich/develop sam detweiler 2019-12-28 15:01:54 -06:00
  • 0e93713464 Merge pull request #1826 from sdetweil/fixcompliments Michael Teeuw 2019-12-28 22:01:16 +01:00
  • 8f60e103f9 Merge branch 'develop' into fixcompliments sam detweiler 2019-12-28 14:58:01 -06:00
  • 9cc702241d Merge pull request #1827 from sdetweil/fix_helper Michael Teeuw 2019-12-28 21:44:10 +01:00
  • 0d61c44232 Merge branch 'develop' into newscripts sam detweiler 2019-12-28 14:42:06 -06:00
  • 9a8faac316 Merge branch 'develop' into fix_helper sam detweiler 2019-12-28 14:36:49 -06:00
  • 05f710cb5c Merge pull request #1838 from tbouron/fix/module-header Michael Teeuw 2019-12-28 19:41:42 +01:00
  • c6184769e7 Merge pull request #1836 from akraus53/patch-2 Michael Teeuw 2019-12-28 19:41:15 +01:00
  • 515d1bd920 Merge branch 'develop' into fixcompliments Michael Teeuw 2019-12-28 19:38:18 +01:00
  • b19cb17bba Merge branch 'develop' into newservermode Michael Teeuw 2019-12-28 19:37:41 +01:00
  • c1e808bce6 Merge pull request #1806 from sdetweil/newElectron Michael Teeuw 2019-12-28 19:35:57 +01:00
  • d8b7292d4b Fix module header update if using customising from module.getHeaders() Thomas Bouron 2019-12-26 13:52:20 +00:00
  • edd5e2f5bc move lxsession screensaver checking to last, some systems still have the folder but don't use it Sam Detweiler 2019-12-24 06:55:12 -06:00
  • efc6cb73b2 Added my contribution to the changelog Alexander Kraus 2019-12-20 15:22:14 +01:00
  • ecd79dc34b Added a padding between days in dateheader mode Alexander Kraus 2019-12-20 15:20:12 +01:00
  • cdfc8b825d Changelog Spencer Cornish 2019-12-19 21:11:57 -07:00
  • 301344c96d Update unsecure dependencies Spencer Cornish 2019-12-19 21:02:39 -07:00
  • 5279995c3b Merge branch 'develop' into newservermode sam detweiler 2019-12-13 08:03:06 -06:00
  • 5176b06b59 add check for root user and abort Sam Detweiler 2019-12-13 08:01:32 -06:00
  • ed61ac624d http default if no address is 0.0.0.0, not localhost, hard code localhost as per readme Sam Detweiler 2019-12-10 12:15:30 -06:00
  • 4da6e3ecee add test for error on 200 rc test path Sam Detweiler 2019-12-10 11:29:26 -06:00
  • 9e5561936a Merge branch 'newElectron' of https://github.com/sdetweil/MagicMirror into newElectron Sam Detweiler 2019-12-10 10:54:18 -06:00
  • 843cd0eff6 change spectron version to match doc, update locak file Sam Detweiler 2019-12-10 10:53:41 -06:00
  • 6b6ee934a1 Merge branch 'develop' into newElectron sam detweiler 2019-12-10 08:31:50 -06:00
  • aea57ffaf4 add new run_start.sh script Sam Detweiler 2019-12-10 08:29:18 -06:00
  • 87b48661fa remove forced npm install Sam Detweiler 2019-12-09 16:41:56 -06:00
  • 556fa44858 move travis to node 10 , latest npm Sam Detweiler 2019-12-09 16:26:49 -06:00
  • 1c3e196508 move travis to node 10 and latest npm Sam Detweiler 2019-12-09 16:24:16 -06:00
  • 9b6812ad0c add package-lock file Sam Detweiler 2019-12-09 11:15:50 -06:00
  • b7944c7fa4 add changelog Sam Detweiler 2019-12-09 10:36:21 -06:00
  • 2fbedca746 stop helper class being erased Sam Detweiler 2019-12-09 10:33:35 -06:00
  • 340d04a48c add changelog entry Sam Detweiler 2019-12-09 09:52:15 -06:00
  • 460a383ffc add changelog Sam Detweiler 2019-12-09 09:46:45 -06:00
  • 52c4e3a256 add changelog update Sam Detweiler 2019-12-09 09:43:32 -06:00
  • 4338f11eb1 Merge branch 'develop' into newscripts sam detweiler 2019-12-09 09:40:06 -06:00
  • 42bab052e0 fix comment Sam Detweiler 2019-12-08 10:07:55 -06:00
  • 0cb377618e add support for sequential compliments usage Sam Detweiler 2019-12-08 09:28:50 -06:00
  • 5e4d25b957 add support for newline (\n) in compliment text Sam Detweiler 2019-12-08 08:50:00 -06:00
  • 153d1853fa add apt get upgrade to actually upgrade files, as OS repos are lagging Sam Detweiler 2019-12-08 08:46:41 -06:00
  • 22a3448461 latest fixes for install and pm2 Sam Detweiler 2019-12-08 08:40:01 -06:00
  • 2cad869680 latest fixes for install and pm2 Sam Detweiler 2019-12-08 08:35:50 -06:00
  • bc912a8ea4 Merge branch 'newscripts' of https://github.com/sdetweil/MagicMirror into newscripts Your Name 2019-11-27 08:38:12 -06:00
  • db9176c284 fix pm2 install needing sudo Your Name 2019-11-27 08:37:51 -06:00
  • 06308210c0 add support for secured apt-get repositories Sam Detweiler 2019-11-23 06:57:10 -06:00
  • 63d9904370 regression checking for macOS Sam Detweiler 2019-11-22 06:30:46 -06:00
  • caaeff5cb7 add support for commented lines in config.js Sam Detweiler 2019-11-22 06:22:21 -06:00
  • d8c93d3455 Merge branch 'newscripts' of https://github.com/sdetweil/MagicMirror into newscripts Sam Detweiler 2019-11-22 06:18:31 -06:00
  • cb28e5fddc watch out for commented lines in config Sam Detweiler 2019-11-22 06:18:04 -06:00
  • 7d7ec1a00b updates for libc6++ on pi 0, node 10 Sam Detweiler 2019-11-21 22:32:48 -06:00
  • a5bc8dfa3f add package.json to update Sam Detweiler 2019-11-19 19:50:46 -06:00
  • d74f055180 Merge pull request #28 from MichMich/develop sam detweiler 2019-11-19 17:15:00 -08:00
  • 73be6c35a6 Merge pull request #1808 from FritzJay/develop Michael Teeuw 2019-11-13 08:01:42 +01:00