martin/silvrgit
martin/silvrgit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# By martind2000
# Via martind2000
* origin/master:
  calendar looping
This commit is contained in:
Martin Donnelly 2016-05-04 12:57:18 +01:00
commit 9c4ef95858
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/today.js
View File

@ -21,7 +21,7 @@ require('sugar-date');
var todayCache = {
last: 0, data: {
trains: {last: 0, data: []}, weather: {}, history: [], today: '', tv: {entries: []}, cal: {today: [], tomorrow:[], week:[]}, swedish: {}, fitbit: {}
trains: {last: 0, data: []}, weather: {}, history: [], today: '', tv: {entries: []}, cal: {today: [], tomorrow: [], week: []}, swedish: {}, fitbit: {}
}, expire: ((60 * 1000) * 60)
};
var file = __dirname + '/' + 'newdata.json';

10
package.json
View File

@ -9,12 +9,12 @@
"forecast.io": "0.0.9",
"htmlparser": "^1.7.7",
"jade": "^1.11.0",
"jsonfile": "^2.2.3",
"lodash": "^4.3.0",
"log4js": "^0.6.31",
"mammoth": "^0.3.25-pre.1",
"jsonfile": "^2.3.0",
"lodash": "^4.11.2",
"log4js": "^0.6.35",
"mammoth": "^1.0.1",
"nano": "^6.2.0",
"request": "^2.67.0",
"request": "^2.72.0",
"simple-weather": "^1.2.2",
"sugar-date": "^1.5.1",
"wordsoap": "^0.2.0",