1068 Commits

Author SHA1 Message Date
42SK
f0db135b1d Added option to ignore old items in the news feed module
Outdated news items can be omitted via the ignoreOldItems and the ignoreOlderThan option.
2017-03-21 19:39:51 +01:00
Rodrigo Ramírez Norambuena
f89f704a69 Add task to check configuration file syntax. 2017-03-18 09:45:32 -03:00
Rodrigo Ramírez Norambuena
ae33de7e7c Add in Changelog missing tests added for 2.1.1 version 2017-03-18 09:42:36 -03:00
Rodrigo Ramírez Norambuena
b23e474648 Format changelog for 2.1.1 2017-03-18 09:36:50 -03:00
Rodrigo Ramírez Norambuena
0d3c03d1e3 Restore code removed on Merges on 2017-03-17 2017-03-17 22:36:21 -03:00
Michael Teeuw
b4dfce4a44 Merge branch 'fewieden-calendar-multiple-icons' into develop 2017-03-17 15:37:40 +01:00
Michael Teeuw
91ca3939b3 Fix Merge Conflicts 2017-03-17 15:36:55 +01:00
Michael Teeuw
f252960aaf Merge branch 'develop' into excluded_events 2017-03-17 14:35:11 +01:00
Michael Teeuw
4aec39df7a Fix Merge Conflicts. 2017-03-17 14:32:01 +01:00
Michael Teeuw
15b19925f2 Fix Merge 2017-03-17 14:16:35 +01:00
Andrew McOlash
ec75ff5292 Merge branch 'develop' into excluded_events 2017-03-17 07:28:06 -05:00
Andrew McOlash
4d3b6b1486 Merge remote-tracking branch 'upstream/develop' into excluded_events 2017-03-17 07:25:42 -05:00
Andrew McOlash
d3fd9a188d Merge branch 'develop' into single_line_news 2017-03-17 07:18:13 -05:00
Andrew McOlash
41a15f90cb Merge remote-tracking branch 'upstream/develop' into single_line_news 2017-03-17 07:17:19 -05:00
Andrew McOlash
8ad1d6fd97 Merge branch 'develop' into degree_label 2017-03-17 07:12:15 -05:00
Andrew McOlash
a18e7eb089 Fix conflict with CHANGELOG, merge with upstream/develop 2017-03-17 07:08:00 -05:00
BeatIdo
1f5ea40bf6 News Feed hideLoading option 2017-03-17 09:08:45 +01:00
fewieden
ccb81179ab fix config option 2017-03-16 16:57:55 +01:00
Andrew McOlash
3c60feed02 Add in degree label to solve issue #753 2017-03-13 06:24:04 -05:00
Andrew McOlash
873125abe1 Add changes to CHANGELOG 2017-03-12 11:39:05 -05:00
Andrew McOlash
a5dc3cd018 Update CHANGELOG to reflect updates to the codebase 2017-03-11 17:40:24 -06:00
Rodrigo Ramírez Norambuena
c282bb2fe1 Fix if MM_PORT enviroment variable is set 2017-03-10 18:20:11 -03:00
Michael Teeuw
2811f76714 Merge pull request #758 from CatoAntonsen/nn_translation
Updated Norwegian translations (nn and nb)
2017-03-10 14:57:09 +01:00
Cato Antonsen
a3836b5e17 Updated Norwegian translations (nn and nb) 2017-03-07 18:06:26 +01:00
Cato Antonsen
c2e90864ac Fixed missing animations on this.show() when module is alone in a region 2017-03-05 22:23:05 +01:00
Rodrigo Ramírez Norambuena
db0b663a3d Put file deprecated into js directory
Request in Pull Request #569
Initial work by @olexs
2017-02-21 19:28:53 -03:00
Rodrigo Ramírez Norambuena
fd7fe129e2 Merge remote-tracking branch 'olexs/deprecated-config-notify' into deprecated-options 2017-02-21 19:13:33 -03:00
APPLEH0LIC
1ccf74bca1 Update CHANGELOG.md
added Korean Translation.
2017-02-09 17:56:56 +09:00
Michael Teeuw
555e01ec87 Merge branch 'develop' into develop 2017-02-08 19:32:53 +01:00
Michael Teeuw
0f0a71a109 Merge pull request #689 from roramirez/test-compliments
add test parts of day for compliments module
2017-02-08 09:14:23 +01:00
LAPTOP-KAUR\race2
cbafaf5d56 compliments,js handles remoteFile without default daytimes defined 2017-02-08 02:35:09 +02:00
LAPTOP-KAUR\race2
62e4e13f5a case correction; added changelog.md entry 2017-02-08 02:33:03 +02:00
Michael Teeuw
e0f6fca987 Merge pull request #688 from Nosrac/develop
New Compliments category: `anytime`
2017-02-07 12:04:40 +01:00
Rodrigo Ramírez Norambuena
6fcaec3ca8 add test parts of day for compliments module 2017-02-06 00:28:08 -03:00
Kyle Carson
a2892ad097 Update Readme and changelog 2017-02-05 19:29:35 -06:00
fewieden
b35c0f7e39 update changelog 2017-02-06 02:08:59 +01:00
Rodrigo Ramírez Norambuena
6fc1141477 Run tests e2e in Travis 2017-01-31 18:38:25 -03:00
Michael Teeuw
b02920c43c Merge pull request #674 from morozgrafix/test_branch
Restructured Test Suite
2017-01-31 21:52:53 +01:00
Sergey Morozov
86fdd91597 Restructured Test Suite
- separated tests into e2e and unit directories
- created configs directory structure to support test framework
- added/modified `npm run test`, `npm run test:unit` and `npm run test:e2e` to target all, unit and e2e tests respectively
- modified some of the test names to be more descriptive

New structure of the Test Suite has following directory tree:

```
tests
├── configs
│   ├── env.js
│   └── modules
│       ├── clock
│       │   ├── clock_12hr.js
│       │   ├── clock_24hr.js
│       │   └── clock_showPeriodUpper.js
│       └── helloworld
│           └── helloworld.js
├── e2e
│   ├── env_spec.js
│   └── modules
│       ├── clock_spec.js
│       └── helloworld_spec.js
└── unit
    ├── functions
    │   └── cmp_versions_spec.js
    └── global_vars
        └── root_path_spec.js
```
2017-01-31 11:08:53 -08:00
Sebastian Limbach
e68fea185d Merge branch 'develop' into feature/docker 2017-01-31 19:48:38 +01:00
Sebastian Limbach
e6a2b9f06e Added the Docker support changes to changelog 2017-01-31 19:40:49 +01:00
Michael Teeuw
ce6cd6acdc Merge pull request #670 from roramirez/translation-check
Translation check
2017-01-31 08:44:10 +01:00
Michael Teeuw
8e129143f1 Merge pull request #671 from Nosrac/develop
Support calendar-specific maximumEntries and maximumNumberOfDays
2017-01-31 08:42:50 +01:00
Sergey Morozov
7731878f36 Add missing 'chai-as-promised' dependency
When I attempted to run e2e tests I got following error:

```
$npm run test:e2e

> magicmirror@2.1.1 test:e2e /Users/sergeym/localDev/MagicMirror
> ./node_modules/mocha/bin/mocha tests/e2e --recursive

module.js:471
    throw err;
    ^

Error: Cannot find module 'chai-as-promised'
...
```

Adding `chai-as-promised` to `package.json` and running npm install fixes it.
2017-01-30 15:33:23 -08:00
Kyle Carson
14cc642e54 Support calendar-specific maximumEntries and maximumNumberOfDays 2017-01-30 16:26:42 -06:00
Michael Teeuw
c3bfaa31ee Merge branch 'develop' into master 2017-01-30 20:55:53 +01:00
Rodrigo Ramírez Norambuena
cb71667336 Use jsonlint task to check translation files 2017-01-30 13:36:22 -03:00
Rodrigo Ramírez Norambuena
c75ee042a8 add e2e test enviroment 2017-01-30 12:36:11 -03:00
Rodrigo Ramírez Norambuena
d474d518ca test e2e module helloworld 2017-01-30 12:24:49 -03:00
artifactdev
ed12deae25 Update CHANGELOG.md
Added color options for calendar and weather forecast to changelog
2017-01-30 13:17:44 +01:00