Rodrigo Ramírez Norambuena
2822303138
Skip from worktree the css/custom.css:
...
On the next release the css/custom.css will rename to
css/custom.css.sample
This change run git instructions to detach the file from own local
repository. This instructions are called in untrack-css.sh file from
run-start.sh and npm postinstall step
Reference #1540
2019-07-26 02:12:10 -04:00
Michael Teeuw
32521aba6b
Merge pull request #1724 from vincep5/develop
...
Fix for weather module not refreshing data after exception
2019-07-11 20:04:30 +02:00
vincep5
819c4cde1c
Fix for weather module not refreshing data after exception
2019-07-11 12:49:24 -05:00
Michael Teeuw
776c486b1a
Merge pull request #1720 from nischi/master
...
Fixing send notification in newsfeed module
2019-07-09 10:43:09 +02:00
Michael Teeuw
bcd97120a4
Merge branch 'develop' into master
2019-07-09 10:33:29 +02:00
Thierry Nischelwitzer
312bfb8509
add changes to changelog
2019-07-09 10:24:43 +02:00
Thierry Nischelwitzer
11c9a50931
send NEWS_FEED notification also for the first newsmessage which are shown
2019-07-09 10:20:02 +02:00
Thierry Nischelwitzer
94c0656bcd
update to 2.8
2019-07-02 19:38:17 +02:00
Michael Teeuw
13313d0b25
Fix changelog.
2019-07-01 20:27:37 +02:00
Michael Teeuw
3a20db1d76
Merge pull request #1716 from sdetweil/newupdater
...
fix updatenotification module to not crash
2019-07-01 20:25:59 +02:00
Michael Teeuw
00148b4cc8
Prepare 2.9.0-develop
2019-07-01 20:22:52 +02:00
Michael Teeuw
a31546b1ff
Merge pull request #1717 from MichMich/develop
...
Release 2.8.0
2019-07-01 20:11:40 +02:00
Michael Teeuw
361b62b8e2
Add update info.
2019-07-01 20:05:28 +02:00
sam detweiler
37327b77a7
Merge branch 'develop' into newupdater
2019-07-01 12:56:01 -05:00
Sam Detweiler
7ef8a5bb11
fix conflict with develop branch
2019-07-01 12:45:40 -05:00
Sam Detweiler
11cfb8af32
Merge branch 'newupdater' of https://github.com/sdetweil/MagicMirror into newupdater
...
pull update
2019-07-01 12:36:52 -05:00
Sam Detweiler
7315f7d283
fix conflict with master repo develop branch
2019-07-01 12:35:47 -05:00
Michael Teeuw
7d58eb718e
Prepare release 2.8.0
2019-07-01 19:06:26 +02:00
Michael Teeuw
651be76776
Merge pull request #1715 from sdetweil/newinstaller
...
update installer to handle non-pi and other issues
2019-07-01 18:36:08 +02:00
sam detweiler
4a5c6f1d39
Update CHANGELOG.md
...
add info on updatenotification module improvements
2019-06-30 07:18:45 -05:00
sam detweiler
5745d71d6a
Update CHANGELOG.md
...
add info on installer changes
2019-06-30 06:57:41 -05:00
Sam Detweiler
db62b7421a
update installer for npm missing, non-PI platforms, mac option on pm2 install
2019-06-29 16:02:44 -05:00
Sam Detweiler
4084c57789
fix updatenotification to not crash
2019-06-29 15:59:03 -05:00
Michael Teeuw
f90bec985a
Fix merge issue.
2019-06-27 09:29:01 +02:00
Michael Teeuw
90f911c529
Fix Merge Issue
2019-06-27 09:27:24 +02:00
Michael Teeuw
6c88b106db
Merge pull request #1713 from alltopafi/weather-module-location-header
...
allow location property in config,js to be used as header
2019-06-27 09:24:28 +02:00
Michael Teeuw
cef69d1b97
Merge pull request #1711 from NiekertDev/patch-1
...
Fix missing '#' (pound) in link
2019-06-27 09:23:10 +02:00
Jesse Alltop
f76a7fb331
allow location property in config,js to be used as header
2019-06-26 19:31:16 -05:00
Niekert
3e7b8b0663
Fix missing '#' (pound) in link
2019-06-24 17:41:51 +02:00
Josef Spitzlberger
a6eb3ad037
added three more class names to 'newsfeed.js'
...
added to 'newsfeed.js' in order to design the news article better with css, three more class-names were introduced: newsfeed-desc, newsfeed-desc, newsfeed-desc
2019-06-21 13:08:36 +02:00
Josef Spitzlberger
9468749384
added three class names
...
in order to design the news article better with css, three more class-names were introduced: newsfeed-desc, newsfeed-desc, newsfeed-desc
2019-06-21 13:05:40 +02:00
Michael Teeuw
37417fa1bb
Merge pull request #1706 from vincep5/develop
...
Adding sunrise/sunset to weathergov
2019-06-18 14:06:52 +02:00
vincep5
217146351e
changelog notes
2019-06-17 10:25:33 -05:00
vincep5
818ec33cef
Adding sunrise/sunset to weathergov
2019-06-17 10:20:49 -05:00
Michael Teeuw
cd1671830a
Merge pull request #1704 from Hg347/develop
...
Develop
2019-06-15 13:27:21 +02:00
Christoph Hagedorn
a5fca87dd0
updated info: fixed race condition on module update
2019-06-15 11:49:57 +02:00
Christoph Hagedorn
f06ce55626
Merge remote-tracking branch 'upstream/develop' into develop
2019-06-15 11:33:44 +02:00
Christoph Hagedorn
853085e755
added null check for moduleWrapper
...
(fixes race condition if element is updated)
2019-06-15 11:32:03 +02:00
Michael Teeuw
2b7accaf68
Merge pull request #1703 from rejas/fix_eslint_errors_automatically
...
Fix tests
2019-06-14 14:39:12 +02:00
Veeck
5533d93172
Update changelog
2019-06-14 14:06:36 +02:00
Veeck
f0e8c865fe
Fix markdown error
2019-06-14 14:03:58 +02:00
Veeck
36400c0a83
Fix some eslint errors from previous merges
2019-06-14 14:03:07 +02:00
Veeck
c5383557b5
Pass fix options to eslint
2019-06-14 14:02:48 +02:00
Michael Teeuw
b645007884
Updated the fetchedLocationName (See PR: #1702 )
2019-06-14 13:42:59 +02:00
Michael Teeuw
63ac137206
Merge branch 'mattdb-calendar-rrule' into develop
2019-06-14 13:32:20 +02:00
Michael Teeuw
808cbf8e0b
Fix Typecheck.
2019-06-14 13:32:07 +02:00
Michael Teeuw
8ed77ba0c7
Merge
2019-06-14 13:31:59 +02:00
Michael Teeuw
66c74c51e4
Merge branch 'rejas-cleanups' into develop
2019-06-14 13:19:43 +02:00
Michael Teeuw
7a272ef0ab
Merge conflict.
2019-06-14 13:19:29 +02:00
Michael Teeuw
60b817ec8e
Merge branch 'cybex-dev-develop' into develop
2019-06-14 13:05:36 +02:00
