Compare commits

...

9 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
dbc7c2cc46 fix upgrade script for notification types 2018-10-22 11:48:36 -04:00
Julian Lam
d84030d55f Merge remote-tracking branch 'origin/master' into v1.10.x 2018-10-15 13:29:47 -04:00
Misty (Bot)
80f3d68e91 Incremented version number - v1.10.2 2018-10-15 17:28:03 +00:00
Misty (Bot)
f4c6602344 Merge commit 'a8e98e46df8b0b0db7f4113402fdadaf6f573df9' into v1.10.x 2018-10-15 17:28:02 +00:00
Misty (Bot)
c8d3c3197b Incremented version number - v1.10.1 2018-07-05 18:42:49 +00:00
Misty (Bot)
d51d98cb7b Merge commit 'b88a8de6a159d0b2cd5114e084b38c82c24d5a2a' into v1.10.x 2018-07-05 18:42:48 +00:00
Barış Soner Uşaklı
5e6d72552e backport plugin install fix #6620
https://github.com/NodeBB/NodeBB/issues/6620
2018-07-02 21:37:36 -04:00
Barış Soner Uşaklı
e0d642c78a backport fix runJobs 2018-06-29 15:51:09 -04:00
Misty (Bot)
134c74358e Incremented version number - v1.10.0 2018-06-27 18:28:46 +00:00
2 changed files with 6 additions and 4 deletions

View File

@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPL-3.0",
"description": "NodeBB Forum",
"version": "1.10.1",
"version": "1.10.2",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
@@ -152,4 +152,4 @@
"url": "https://github.com/barisusakli"
}
]
}
}

View File

@@ -12,12 +12,14 @@ module.exports = {
db.getObject('config', next);
},
function (config, next) {
var postNotifications = parseInt(config.sendPostNotifications, 10) === 1 ? 'notification' : 'none';
var chatNotifications = parseInt(config.sendChatNotifications, 10) === 1 ? 'notification' : 'none';
db.setObject('config', {
notificationType_upvote: config.notificationType_upvote || 'notification',
'notificationType_new-topic': config['notificationType_new-topic'] || 'notification',
'notificationType_new-reply': config['notificationType_new-reply'] || config.sendPostNotifications || 'notification',
'notificationType_new-reply': config['notificationType_new-reply'] || postNotifications,
notificationType_follow: config.notificationType_follow || 'notification',
'notificationType_new-chat': config['notificationType_new-chat'] || config.sendChatNotifications || 'notification',
'notificationType_new-chat': config['notificationType_new-chat'] || chatNotifications,
'notificationType_group-invite': config['notificationType_group-invite'] || 'notification',
}, next);
},