Michael Teeuw
cd5623b348
Merge pull request #972 from roramirez/add-warning-color-full-ip
...
Add warning color when are using full ip whitelist
2017-08-10 12:11:51 +02:00
Michael Teeuw
673e051bd5
Merge pull request #969 from roramirez/showWeek-test-es-language
...
Show week test es language
2017-08-10 12:11:25 +02:00
Michael Teeuw
66c949057e
Merge pull request #968 from roramirez/set-version-test-dependencies
...
Set version spectron for 3.6.x
2017-08-10 12:11:12 +02:00
Rodrigo Ramírez Norambuena
d34b493b7d
Fix clock_es_spec running before the clock_spec
2017-08-05 22:30:38 -04:00
Rodrigo Ramírez Norambuena
4df6e0ee7d
Merge remote-tracking branch 'upstream/develop' into showWeek-test-es-language
2017-08-05 21:12:39 -04:00
Rodrigo Ramírez Norambuena
87c4dc313a
Merge branch 'develop' into set-version-test-dependencies
2017-08-05 17:44:51 -04:00
Rodrigo Ramírez Norambuena
0d29339898
Merge branch 'develop' into add-warning-color-full-ip
2017-08-05 17:44:05 -04:00
Michael Teeuw
6d83f18490
Merge pull request #981 from roramirez/disable-vendor_spec
...
Disabled tests of vendor_spec:
2017-08-05 21:30:44 +02:00
Rodrigo Ramírez Norambuena
0ba125c2d7
Disabled tests of vendor_spec:
...
Sometimes these getting failed in Travis.
2017-08-05 02:40:03 -04:00
Rodrigo Ramírez Norambuena
6abd120a5c
Add CHANGELOG entry for color in warning if full ip whitelist
2017-08-04 22:39:52 -04:00
Rodrigo Ramírez Norambuena
5cf7e89ce6
Merge remote-tracking branch 'roramirez_github/develop' into add-warning-color-full-ip
2017-08-04 22:38:31 -04:00
Michael Teeuw
586beea21e
Merge pull request #977 from roramirez/use-before-after-vendors
...
Use before after vendors
2017-08-02 12:07:40 +02:00
Rodrigo Ramírez Norambuena
19f80cf506
Add entry in Changelog for change hooks in vendors_spec
2017-07-31 16:58:33 -04:00
Rodrigo Ramírez Norambuena
d01100bb15
Merge remote-tracking branch 'roramirez_github/develop' into use-before-after-vendors
2017-07-31 16:57:24 -04:00
Michael Teeuw
1eb10e3c22
Merge pull request #971 from roramirez/set-title-magicmirror-2
...
Set title on MagicMirror² for index.html
2017-07-31 15:04:54 +02:00
Michael Teeuw
4772fbcd4a
Merge pull request #970 from QNimbus/unittest-calendar
...
Add new unit tests
2017-07-31 15:04:25 +02:00
Michael Teeuw
18b61e35be
Merge branch 'develop' into unittest-calendar
2017-07-31 15:04:16 +02:00
Michael Teeuw
bb7faf0fb3
Merge pull request #967 from roramirez/show-test-build-npm-dependencies
...
Debug npm list in CI
2017-07-31 15:03:25 +02:00
Michael Teeuw
1603742adc
Merge branch 'develop' into show-test-build-npm-dependencies
2017-07-31 15:03:20 +02:00
Michael Teeuw
8a830e40bb
Merge pull request #966 from roramirez/format-changelog
...
Fix litles changes of format in the Changelog
2017-07-31 15:02:43 +02:00
Michael Teeuw
d8adcf5a84
Merge branch 'develop' into format-changelog
2017-07-31 15:02:36 +02:00
Michael Teeuw
1d9a404f77
Merge pull request #965 from roramirez/newfeed-unit
...
Newfeed unit
2017-07-31 15:00:37 +02:00
Michael Teeuw
26dcaf6078
Merge pull request #962 from QNimbus/fix-issue-961
...
Fix calendar.js bug
2017-07-31 15:00:15 +02:00
Michael Teeuw
a91e4014bf
Merge pull request #959 from roramirez/include-node-8
...
Include node 8 testsuite and CI
2017-07-31 14:59:34 +02:00
Bas van Wetten
35e3b889c3
Add new unit tests
...
Add new unit tests for 'shorten' function in calendar module
2017-07-29 16:02:53 +02:00
Bas van Wetten
5ef6ba0258
Small edit of CHANGELOG
...
Added a period at the end of the CHANGELOG entries
2017-07-29 11:44:43 +02:00
Bas van Wetten
12754ff135
Updated changelog for calendar fix
...
Updated changelog for calendar fix
2017-07-28 22:19:25 +02:00
Bas van Wetten
d09a1e254f
Merge branch 'fix-issue-963' into fix-issue-961
2017-07-28 21:34:58 +02:00
Bas van Wetten
b89ee67daf
Merge branch 'fix-issue-961' into fix-issue-963
2017-07-28 21:33:10 +02:00
Bas van Wetten
7bd256c311
Fix calendar.js bug issue #963
...
Fixed calendar specific configuration settings maximumEntries and maximumNumberOfDays not overriding global setting
2017-07-28 21:07:38 +02:00
Bas van Wetten
4add7cd0b3
Fix calendar.js bug
...
Fix bug where excludedEvents count towards maximumEntries displayed
2017-07-28 17:47:22 +02:00
Rodrigo Ramírez Norambuena
9d7b0487d5
Change hooks for vendor_spec:
...
Use the hooks before and after in the vendor_spec instead of use beforeAll and
afterAll in the e2e test to prevent failure in CI.
2017-07-25 20:24:04 -04:00
Rodrigo Ramírez Norambuena
765b03c868
Add warning color when are using full ip whitelist
2017-07-25 11:26:01 -04:00
Rodrigo Ramírez Norambuena
41ce3db8f9
Set title on MagicMirror² for index.html
2017-07-25 11:00:38 -04:00
Rodrigo Ramírez Norambuena
00e3ef757c
Merge remote-tracking branch 'roramirez_github/develop' into showWeek-test-es-language
2017-07-25 10:53:50 -04:00
Rodrigo Ramírez Norambuena
84dc0b2959
Set version spectron for 3.6.x
2017-07-25 10:28:45 -04:00
Rodrigo Ramírez Norambuena
2e48099070
Debug npm list in CI
...
Execute npm list after the tests in Travis
2017-07-25 10:07:32 -04:00
Rodrigo Ramírez Norambuena
77779bbcd9
Fix litles changes of format in the Changelog
2017-07-25 09:50:51 -04:00
Rodrigo Ramírez Norambuena
e08bc01c33
Fix conflict with test function newsfeed
2017-07-25 09:32:32 -04:00
Michael Teeuw
bf24ee369f
Merge pull request #957 from QNimbus/develop
...
Addition to .gitignore to ignore VS Code folder
2017-07-25 14:50:00 +02:00
Michael Teeuw
876f12db89
Merge pull request #955 from roramirez/close-code-tag-README-modules
...
Close code tag and fix format for Modules Readme
2017-07-25 14:49:42 +02:00
Michael Teeuw
8b84459e13
Merge pull request #953 from roramirez/activate-test-e2e
...
Activate e2e test in Travis and desactivate failed test in CI:
2017-07-25 14:49:25 +02:00
Rodrigo Ramírez Norambuena
dccfcc9663
Merge pull request #2 from QNimbus/activate-test-e2e
...
Change suggestion for e2e testing
2017-07-24 22:38:32 -04:00
Bas van Wetten
203e1cc9b9
Implemented requested change PR #2
...
Moved tests/e2e_new to tests/e2e folder
2017-07-24 22:08:12 +02:00
Bas van Wetten
b612f0cdec
PR for issue #956
...
Changed .gitignore to ignore Visual Studio Code project folder with custom launch configuration. (See issue #956 )
2017-07-24 21:56:53 +02:00
Rodrigo Ramírez Norambuena
961301fbec
Merge remote-tracking branch 'roramirez_github/develop' into newfeed-unit
2017-07-24 11:36:16 -04:00
Rodrigo Ramírez Norambuena
2a38d99cf1
Merge remote-tracking branch 'roramirez_github/develop' into include-node-8
2017-07-24 11:34:47 -04:00
Rodrigo Ramírez Norambuena
7903328c2d
Add Node 8 for testing
2017-07-23 20:49:52 -04:00
Rodrigo Ramírez Norambuena
56d2b4a80c
Close code tag and fix format for Modules Readme
2017-07-23 20:31:26 -04:00
Bas van Wetten
318c8c68b0
Change suggestion for e2e testing
...
- Changed global-setup.js to allow for easier test creation
- Changed each e2e test suite to work with new global-setup.js
- All tests (except for dev_console.js) now work with Travis CI
2017-07-23 23:06:27 +02:00
