kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-30 21:13:49 +00:00
Code Issues Projects Releases Wiki Activity
1,305 Commits 3 Branches 49 Tags
Commit Graph

1305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodrigo Ramírez Norambuena
a15b8077a3 Add test without access by ipWhistelist 
This test set a invalid IP address for not have access to MagicMirror.
Creates a request to localhost and port added in configuration and check if
gets 403 HTTP code.
 2017-03-07 19:50:19 -03:00
Michael Teeuw
6ea1732630 Merge pull request #749 from peet86/develop 
Small fixes in the Hungarian translation
 2017-03-06 15:07:29 +01:00
Peter Varga
1027efd6e5 small fixes in hu translation 2017-03-05 19:50:48 +01:00
Michael Teeuw
bd0de83d31 Merge pull request #745 from roramirez/mv-colors-utils 
Move colors in utils file
 2017-03-05 17:16:16 +01:00
Michael Teeuw
4d3523b677 Merge pull request #746 from roramirez/json-format-config-pm2 
Use JSON format for configuration file on pm2 control process file
 2017-03-05 17:15:56 +01:00
Michael Teeuw
03f15e0075 Merge pull request #747 from roramirez/comment-bash-installer 
Fix format comments on installer script
 2017-03-05 17:15:33 +01:00
Michael Teeuw
043779f4af Merge pull request #743 from fewi/build-docker-windows 
Fix error when building and running docker on windows
 2017-03-03 13:26:32 +01:00
Felix Wiedemann
25b5daf6a5 fix problems when building the docker image on windows 2017-03-03 13:06:32 +01:00
Rodrigo Ramírez Norambuena
db444f5d7e Fix format comments on installer script 2017-03-02 09:22:32 -03:00
Rodrigo Ramírez Norambuena
16499d2fb8 Use JSON format for configuration pm2 control process file on installer 
file.

Also, add to validate format on Gruntfile
 2017-03-01 22:12:09 -03:00
Rodrigo Ramírez Norambuena
ddff2b2982 Move colors into utils file 2017-02-28 01:41:21 -03:00
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 79c79146a5df730cb8e8eee1cc1008639a2c21c7
 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