fewieden
11a59e26b2
update package locks
2019-09-11 13:13:08 +02:00
fewieden
ec6d9e3521
Merge branch 'develop' into feature/automated-weather-tests
...
# Conflicts:
# modules/default/weather/weather.js
# package-lock.json
# package.json
2019-09-11 13:07:31 +02:00
fewieden
230accd31e
fix current weather tests
2019-09-11 12:59:55 +02:00
fewieden
a24a4a747e
current weather tests
2019-09-11 12:27:06 +02:00
Michael Teeuw
a77128d5f7
Merge pull request #1752 from roramirez/mode-en.json-translation
...
Revert change mode file en.json for translations
2019-08-16 13:18:01 +02:00
Michael Teeuw
1b2673367e
Merge pull request #1753 from roramirez/tests-404-vendors
...
Tests 404 vendors
2019-08-16 13:17:46 +02:00
Rodrigo Ramírez Norambuena
ce10e91a60
Merge remote-tracking branch 'origin/develop' into tests-404-vendors
2019-08-09 01:47:35 -04:00
Rodrigo Ramírez Norambuena
5244b37d2c
Revert change mode file en.json for translations
...
This change it done in commit c80e04fe8d389a438a4d1676037408b745630a9c
and this patch revert to old status for this file.
2019-08-09 01:29:01 -04:00
Michael Teeuw
1239c6716b
Merge pull request #1749 from putera/develop
...
Adding a Malay translations
2019-08-06 07:48:03 +02:00
Zulkifli Mohamed
67f6258ab0
Adding a Malay translations
2019-08-06 08:39:57 +08:00
Zulkifli Mohamed
9f63172b43
Adding a Malay translations
2019-08-06 08:36:39 +08:00
Michael Teeuw
bd8bfeb525
Merge pull request #1745 from roramirez/update-year-license
...
Update year Copyright License
2019-08-03 18:47:28 +02:00
Michael Teeuw
4918c4ef4b
Merge pull request #1744 from roramirez/custom-css-step-1
...
Skip from worktree the css/custom.css:
2019-08-03 18:47:04 +02:00
Michael Teeuw
00d9ea9344
Merge pull request #1743 from roramirez/lint
...
linter fixes
2019-08-03 18:45:58 +02:00
Michael Teeuw
33537cde76
Merge pull request #1742 from roramirez/es-update
...
Add PRECIP for the Spanish translation
2019-08-03 18:45:27 +02:00
Michael Teeuw
3d5db5c9ca
Merge pull request #1741 from roramirez/remove-comment-bash-lines
...
installer: Remove comment lines added in PR #1715
2019-08-03 18:44:58 +02:00
Michael Teeuw
fdf339514d
Merge pull request #1748 from roramirez/fix-build
...
Fix Build Failed in Travis CI:
2019-08-03 18:32:01 +02:00
Rodrigo Ramírez Norambuena
937c4e485a
Merge remote-tracking branch 'origin/develop' into remove-comment-bash-lines
2019-08-02 00:48:44 -04:00
Rodrigo Ramírez Norambuena
837c060e1f
Merge remote-tracking branch 'origin/develop' into custom-css-step-1
2019-08-02 00:47:24 -04:00
Rodrigo Ramírez Norambuena
00bacd7dde
Merge remote-tracking branch 'origin/develop' into es-update
2019-08-02 00:46:54 -04:00
Rodrigo Ramírez Norambuena
781031775e
Merge remote-tracking branch 'origin/develop' into lint
2019-08-02 00:46:32 -04:00
Rodrigo Ramírez Norambuena
97aee3d375
Merge remote-tracking branch 'origin/develop' into update-year-license
2019-08-02 00:46:06 -04:00
Rodrigo Ramírez Norambuena
34698751f2
Fix Build Failed in Travis CI:
...
This commit set trusty as image to use and revert this commit changes
Add xvfb as service: 3c31460f2fd193864fdc69781d8041f1626b6937
Remove failing script: d5cb60b19cea7851b0d42ee2d028b136b08a6ec1
2019-08-02 00:31:43 -04:00
Michael Teeuw
3c31460f2f
Add xvfb as service.
2019-07-31 09:53:46 +02:00
Michael Teeuw
d5cb60b19c
Remove failing script.
2019-07-31 09:49:22 +02:00
Rodrigo Ramírez Norambuena
3a7cfe3208
Enable Test e2e/vendor_spec.js
2019-07-26 02:21:56 -04:00
Rodrigo Ramírez Norambuena
f079cdad64
Merge remote-tracking branch 'origin/develop' into tests-404-vendors
2019-07-26 02:19:10 -04:00
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
Rodrigo Ramírez Norambuena
e38de75520
Update year Copyright License
2019-07-26 02:04:38 -04:00
Rodrigo Ramírez Norambuena
2723604d3e
installer: Remove comment lines added in PR #1715
2019-07-26 01:25:54 -04:00
Rodrigo Ramírez Norambuena
82ee051c1a
linter fixes
2019-07-26 01:25:26 -04:00
Rodrigo Ramírez Norambuena
7bdf49b7e0
Add PRECIP for the Spanish translation
2019-07-26 01:24:59 -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
