diff --git a/public/src/app.js b/public/src/app.js index a82c730ee2..b8d2afd710 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -36,6 +36,7 @@ var socket, $('#disconnect-modal').show(); $('#reload-button').on('click',function(){ $('#disconnect-modal').hide(); + console.log(window.location.href); window.location.reload(); }); }); diff --git a/src/routes/user.js b/src/routes/user.js index caff2c837d..6e74a88653 100644 --- a/src/routes/user.js +++ b/src/routes/user.js @@ -101,8 +101,6 @@ var user = require('./../user.js'), var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif']; var type = req.files.userPhoto.type; - console.log(req.files.userPhoto); - if(allowedTypes.indexOf(type) === -1) { res.send({ error: 'Allowed image types are png, jpg and gif!' @@ -284,9 +282,9 @@ var user = require('./../user.js'), user.getUserData(uid, function(data) { if(data) { - console.log(data.joindate); + data.joindate = utils.relativeTime(data.joindate); - console.log(data.joindate); + if(!data.birthday) data.age = ''; else diff --git a/src/user.js b/src/user.js index e378f40bb4..6cc5a39dbc 100644 --- a/src/user.js +++ b/src/user.js @@ -80,7 +80,7 @@ var config = require('../config.js'), for(var i=0,ii=fields.length; i