Merge branch 'master' into stage
This commit is contained in:
commit
17530c1cfb
|
@ -100,7 +100,6 @@ exports.resendVerificationEmail = function(req, res, next){
|
|||
*/
|
||||
exports.signup = function(req, res) {
|
||||
// For security measures we remove the roles from the req.body object
|
||||
if (req.body) {
|
||||
delete req.body.roles;
|
||||
|
||||
// Init Variables
|
||||
|
@ -140,9 +139,6 @@ exports.signup = function(req, res) {
|
|||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
res.status(500).send('Incomplete Data');
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
deviceType: ''
|
||||
};
|
||||
|
||||
$http.get('http://jsonip.com/').success(function(response) {
|
||||
$http.get('https://jsonip.com/').success(function(response) {
|
||||
visitorData.ipAddr = response['ip']+'';
|
||||
}).error(function(error) {
|
||||
console.error('Could not get users\'s ip');
|
||||
|
|
Loading…
Reference in a new issue