Merge branch 'master' into stage

This commit is contained in:
David Baldwynn 2016-07-04 17:12:49 -07:00
commit 17530c1cfb
2 changed files with 1 additions and 5 deletions

View file

@ -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');
}
};
/**

View file

@ -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');