krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into api-v3

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-04-02 11:34:04 +02:00
parent 3b98fe377f 0ba47de43d
commit e95837f69f
4 changed files with 98 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/src/controllers/api-v2/user.js
View File

@@ -372,7 +372,7 @@ api.update = (req, res, next) => {
api.cron = function(req, res, next) {
var user = res.locals.user,
progress = user.fns.cron({analytics:utils.analytics}),
progress = user.fns.cron({analytics:utils.analytics, timezoneOffset:req.headers['x-user-timezoneoffset']}),
ranCron = user.isModified(),
quest = shared.content.quests[user.party.quest.key];