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

Merge remote-tracking branch 'origin/develop' into negue/flagpm

Browse Source
This commit is contained in:
negue
2018-11-29 19:02:01 +01:00
parent 0aba448c48 b82660823d
commit 817c943860
316 changed files with 18625 additions and 17558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/server/libs/analyticsService.js
View File

@@ -72,6 +72,9 @@ let _formatUserData = (user) => {
properties.balanceGemAmount = properties.balance * 4;
properties.tutorialComplete = user.flags && user.flags.tour && user.flags.tour.intro === -2;
properties.verifiedUsername = user.flags && user.flags.verifiedUsername;
if (properties.verifiedUsername && user.auth && user.auth.local) {
properties.username = user.auth.local.lowerCaseUsername;
}
if (user.habits && user.dailys && user.todos && user.rewards) {
properties['Number Of Tasks'] = {

2
website/server/libs/bannedSlurs.js
View File

@@ -102,6 +102,8 @@ let bannedSlurs = [
'fags',
'faggot',
'faggots',
'sodomite',
'sodomites',
'whore',
'whores',
'cunt',

4
website/server/libs/payments/amazon.js
View File

@@ -22,10 +22,10 @@ import { model as Coupon } from '../../models/coupon';
// TODO better handling of errors
const i18n = common.i18n;
const IS_PROD = nconf.get('NODE_ENV') === 'production';
const IS_SANDBOX = nconf.get('AMAZON_PAYMENTS:MODE') === 'sandbox';
let amzPayment = amazonPayments.connect({
environment: amazonPayments.Environment[IS_PROD ? 'Production' : 'Sandbox'],
environment: amazonPayments.Environment[IS_SANDBOX ? 'Sandbox' : 'Production'],
sellerId: nconf.get('AMAZON_PAYMENTS:SELLER_ID'),
mwsAccessKey: nconf.get('AMAZON_PAYMENTS:MWS_KEY'),
mwsSecretKey: nconf.get('AMAZON_PAYMENTS:MWS_SECRET'),