Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-06 07:40:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-01-31 13:48:50 -05:00
parent 897a7d84f9 dd34fde7b5
commit b2cb3def98
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/package.json
View File

@@ -60,7 +60,7 @@
"mousetrap": "^1.6.1",
"mubsub": "^1.4.0",
"nconf": "^0.9.1",
"nodebb-plugin-composer-default": "6.0.9",
"nodebb-plugin-composer-default": "6.0.11",
"nodebb-plugin-dbsearch": "2.0.9",
"nodebb-plugin-emoji": "2.1.0",
"nodebb-plugin-emoji-android": "2.0.0",

2
public/language/pt-BR/notifications.json
View File

@@ -9,7 +9,7 @@
"continue_to": "Continuar para %1",
"return_to": "Voltar para %1",
"new_notification": "Nova Notificação",
"new_notification_from": "You have a new Notification from %1",
"new_notification_from": "Você possui uma nova notificação de %1",
"you_have_unread_notifications": "Você possui notificações não lidas.",
"all": "Tudo",
"topics": "Tópicos",

6
public/src/admin/manage/users.js
View File

@@ -191,6 +191,9 @@ define('admin/manage/users', ['translator', 'benchpress'], function (translator,
app.alertSuccess('[[admin/manage/users:alerts.delete-success]]');
removeSelected();
unselectAll();
if (!$('.users-table [component="user/select/single"]').length) {
ajaxify.refresh();
}
});
}
});
@@ -211,6 +214,9 @@ define('admin/manage/users', ['translator', 'benchpress'], function (translator,
app.alertSuccess('[[admin/manage/users:alerts.delete-success]]');
removeSelected();
unselectAll();
if (!$('.users-table [component="user/select/single"]').length) {
ajaxify.refresh();
}
});
}
});

2
public/src/modules/navigator.js
View File

@@ -193,7 +193,7 @@ define('navigator', ['forum/pagination', 'components'], function (pagination, co
index = index > count ? count : index;
var relIndex = getRelativeIndex();
$('.pagination-block .pagination-text').translateHtml('[[global:pagination.out_of, ' + relIndex + ', ' + count + ']]');
var fraction = relIndex / count;
var fraction = (relIndex - 1) / (count - 1 || 1);
$('.pagination-block meter').val(fraction);
$('.pagination-block .progress-bar').width((fraction * 100) + '%');
};

8
src/groups/membership.js
View File

@@ -292,13 +292,7 @@ module.exports = function (Groups) {
async.each(groups, function (groupName, next) {
async.parallel([
function (next) {
Groups.isMember(uid, groupName, function (err, isMember) {
if (!err && isMember) {
Groups.leave(groupName, uid, next);
} else {
next();
}
});
Groups.leave(groupName, uid, next);
},
function (next) {
Groups.rejectMembership(groupName, uid, next);

3
src/notifications.js
View File

@@ -220,9 +220,10 @@ function pushToUids(uids, notification, callback) {
async.eachLimit(uids, 3, function (uid, next) {
emailer.send('notification', uid, {
path: notification.path,
subject: notification.subject || '[[notifications:new_notification_from, ' + meta.config.title + ']]',
subject: utils.stripHTMLTags(notification.subject || '[[notifications:new_notification_from, ' + meta.config.title + ']]'),
intro: utils.stripHTMLTags(notification.bodyShort),
body: utils.stripHTMLTags(notification.bodyLong || ''),
notification: notification,
showUnsubscribe: true,
}, next);
}, callback);