 Michael Teeuw
|
e697ee72fa
|
Merge pull request #734 from roramirez/refactor-routes
refactor code for include multiples routes on js/server.js
|
2017-02-25 22:12:43 +01:00 |
|
|
Michael Teeuw
|
f98c59172b
|
Merge pull request #736 from roramirez/readme-electron-optins
fix format kiosk mode options setted in README
|
2017-02-25 11:39:10 +01:00 |
|
|
Michael Teeuw
|
3badafaa82
|
Merge pull request #737 from roramirez/deprecated-options
Deprecated options
|
2017-02-25 11:38:30 +01:00 |
|
|
Michael Teeuw
|
cbf65a9355
|
Merge pull request #739 from roramirez/more_info_comment_hotfix
Add more information and tag FIXME on Hotfix code
|
2017-02-25 11:37:18 +01:00 |
|
 Rodrigo Ramírez Norambuena
|
365bc900b0
|
Add more information and tag FIXME on Hotfix code
|
2017-02-24 18:52:33 -03:00 |
|
|
Rodrigo Ramírez Norambuena
|
bd0da63f4c
|
use colors for warning message in deprecated options
|
2017-02-21 20:28:12 -03: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 |
|
|
Rodrigo Ramírez Norambuena
|
27253c360b
|
fix format kiosk mode options setted in README
|
2017-02-21 19:03:39 -03:00 |
|
|
Rodrigo Ramírez Norambuena
|
ab226d16c8
|
refactor code for include multiples routes on js/server.js
|
2017-02-21 10:33:54 -03:00 |
|
|
Michael Teeuw
|
d6394402b8
|
Merge pull request #733 from roramirez/second-test-anytime
Second test case anytime feature module compliments
|
2017-02-21 10:56:32 +01:00 |
|
|
Michael Teeuw
|
6be5fac953
|
Merge pull request #725 from roramirez/compliments-anytime
Test anytime compliments module.
|
2017-02-20 19:54:33 +01:00 |
|
|
Michael Teeuw
|
c4435279de
|
Merge pull request #728 from roramirez/global-setup-test
Refactoring some e2e tests.
|
2017-02-20 18:19:53 +01:00 |
|
|
Michael Teeuw
|
a9bdc8ad85
|
Merge pull request #727 from roramirez/vNode7
Add version Node 7 in travis
|
2017-02-20 18:19:22 +01:00 |
|
|
Michael Teeuw
|
df2a5fc789
|
Merge pull request #726 from roramirez/issue-709
Issue 709
|
2017-02-20 18:19:05 +01:00 |
|
|
Rodrigo Ramírez Norambuena
|
5af2768d33
|
refactor afterEach and beforeEach compliments_spec
|
2017-02-20 05:25:16 -03:00 |
|
|
Rodrigo Ramírez Norambuena
|
474695643f
|
Second test case anytime feature module compliments
Suggested by @fewieden PL #725
|
2017-02-20 04:59:15 -03:00 |
|
|
Rodrigo Ramírez Norambuena
|
97ab88b39a
|
Modified test compliments anytime this follow configuration:
{
morning: [],
afternoon: [],
evening: [],
anytime: ["Anytime here"]
}
|
2017-02-20 01:52:07 -03:00 |
|
|
Rodrigo Ramírez Norambuena
|
3773d40201
|
Refactoring some e2e tests. Now is use a global-setup instead of
repeat repeat code to setup tests enviroment.
|
2017-02-19 21:06:38 -03:00 |
|
|
Rodrigo Ramírez Norambuena
|
b3fd01fe04
|
Add version Node 7 in travis
|
2017-02-19 20:06:20 -03:00 |
|
|
Rodrigo Ramírez Norambuena
|
75c4ca77c2
|
Update socket.io to 1.7.3
|
2017-02-19 19:57:21 -03:00 |
|
|
Rodrigo Ramírez Norambuena
|
1a296a8ca1
|
Test anytime compliments module.
feature introduced 79c79146a5
|
2017-02-18 23:38:39 -03:00 |
|
|
Michael Teeuw
|
11c0221f81
|
Merge pull request #720 from roramirez/prevent_error_load
Prevent crash system if cannot load a js script or style sheet.
|
2017-02-15 11:55:46 +01:00 |
|
|
Michael Teeuw
|
2d0aad3da9
|
Merge pull request #721 from roramirez/extra-spaces-return
remove extra spaces alert README
|
2017-02-15 11:55:15 +01:00 |
|
|
Michael Teeuw
|
ff19cb68b4
|
Merge pull request #716 from roramirez/increment-timeouts-test-e2e
Increment timeout e2e test to 20000 ms
|
2017-02-13 20:37:20 +01:00 |
|
|
Rodrigo Ramírez Norambuena
|
e62df3b3b1
|
Increment timeout e2e test to 20000 ms
|
2017-02-12 15:42:00 -03:00 |
|
|
Rodrigo Ramírez Norambuena
|
1d024cc339
|
remove extra spaces alert README
|
2017-02-12 13:29:36 -03:00 |
|
|
Rodrigo Ramírez Norambuena
|
8bda91aafb
|
Prevent crash system if cannot load a js script or style sheet.
|
2017-02-12 13:06:11 -03:00 |
|
|
Michael Teeuw
|
dc81ca4f53
|
Merge pull request #715 from roramirez/spelling
fixed minor word mistake
|
2017-02-11 23:48:59 +01:00 |
|
|
Rodrigo Ramírez Norambuena
|
fb754f9bc7
|
fixed minor word mistake
|
2017-02-11 19:34:43 -03:00 |
|
|
Michael Teeuw
|
7045f6571f
|
Merge pull request #711 from qistoph/develop
Check for dev console instead of counting windows
|
2017-02-11 22:39:25 +01:00 |
|
|
Michael Teeuw
|
50d9bccacf
|
Merge pull request #714 from qistoph/fix712
Fix issue #712
|
2017-02-11 22:37:19 +01:00 |
|
 Chris van Marle
|
9064769185
|
Check for dev console
|
2017-02-11 13:43:03 +01:00 |
|
|
Chris van Marle
|
5fc16bdbfb
|
Fix sabado in clock_es_spec.js test
Fixes #712
|
2017-02-11 13:41:00 +01:00 |
|
|
Michael Teeuw
|
172e4e939d
|
Merge pull request #705 from roramirez/text-fresh-update-branch
add note for pull request about update develop branch
|
2017-02-10 09:21:20 +01:00 |
|
|
Rodrigo Ramírez Norambuena
|
f914b728ff
|
add note for pull request about update develop branch
|
2017-02-09 14:10:07 -03:00 |
|
|
Michael Teeuw
|
54857e843b
|
Merge pull request #704 from APPLEH0LIC/develop
Added Korean Translation
|
2017-02-09 13:32:19 +01:00 |
|
|
Michael Teeuw
|
64b34e98c7
|
Remove comments.
|
2017-02-09 13:28:20 +01:00 |
|
 APPLEH0LIC
|
1ccf74bca1
|
Update CHANGELOG.md
added Korean Translation.
|
2017-02-09 17:56:56 +09:00 |
|
|
APPLEH0LIC
|
49a534a61b
|
Add kr.json file
Added Korean Translation kr.json file.
|
2017-02-09 17:56:06 +09:00 |
|
|
APPLEH0LIC
|
b8889c6a1f
|
Update translations.js
Added Korean Translation
|
2017-02-09 17:54:47 +09:00 |
|
|
Michael Teeuw
|
ccbc5c9d17
|
Merge pull request #696 from kpaaro/develop
Compliments module can use remoteFile without default daytime arrays defined
|
2017-02-08 19:35:09 +01:00 |
|
|
Michael Teeuw
|
555e01ec87
|
Merge branch 'develop' into develop
|
2017-02-08 19:32:53 +01:00 |
|
|
Michael Teeuw
|
7869f472c3
|
Merge pull request #697 from roramirez/global_version
unit test global.version
|
2017-02-08 19:32:11 +01:00 |
|
 LAPTOP-KAUR\race2
|
90f60f95f7
|
formating fix so that grunt passes
|
2017-02-08 19:29:52 +02: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 |
|
|
Michael Teeuw
|
a43c8a2def
|
Merge pull request #695 from fewieden/develop
applied dry pattern
|
2017-02-08 09:11:02 +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 |
|
 fewieden
|
e69908abef
|
fix indentation
|
2017-02-08 00:10:44 +01:00 |
|