Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into static-page-merch

Browse Source
This commit is contained in:
Daniel Van Camp
2015-12-14 21:27:50 +01:00
parent 3d9b2047d0 883fd14775
commit 3c7ddf8df1
792 changed files with 14770 additions and 11542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/src/controllers/api-v2/auth.js
+2 -2
View File
@@ -156,7 +156,7 @@ api.loginLocal = function(req, res, next) {
User.findOne(login, {auth:1}, function(err, user){
if (err) return next(err);
if (!user) return res.json(401, {err:"Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\"."});
if (!user) return res.json(401, {err:"Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\" on the habitica.com website's login form."});
if (user.auth.blocked) return res.json(401, accountSuspended(user._id));
// We needed the whole user object first so we can get his salt to encrypt password comparison
User.findOne(
@@ -164,7 +164,7 @@ api.loginLocal = function(req, res, next) {
, {_id:1, apiToken:1}
, function(err, user){
if (err) return next(err);
if (!user) return res.json(401,{err:"Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\"."});
if (!user) return res.json(401,{err:"Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\" on the habitica.com website's login form."});
res.json({id: user._id,token: user.apiToken});
password = null;
});
website/src/controllers/payments/iap.js
+1 -1
View File
@@ -61,7 +61,7 @@ exports.androidVerify = function(req, res, next) {
data: googleRes
};
payments.buyGems({user:user, paymentMethod:'IAP GooglePlay'});
payments.buyGems({user:user, paymentMethod:'IAP GooglePlay', amount: 5.25});
return res.json(resObj);
}
website/src/models/user.js
+1 -2
View File
@@ -154,7 +154,6 @@ var UserSchema = new Schema({
tavern: {type: Boolean, 'default': false},
equipment: {type: Boolean, 'default': false},
items: {type: Boolean, 'default': false},
inviteParty: {type: Boolean, 'default': false},
},
ios: {
addTask: {type: Boolean, 'default': false},
@@ -586,7 +585,7 @@ UserSchema.methods.unlink = function(options, cb) {
function _populateDefaultsForNewUser(user) {
var taskTypes;
if (user.registeredThrough === "habitica-web") {
if (user.registeredThrough === "habitica-web" || user.registeredThrough === "habitica-android") {
taskTypes = ['habits', 'dailys', 'todos', 'rewards', 'tags'];
var tutorialCommonSections = [