diff --git a/install/package.json b/install/package.json index 9018846723..97dbfaf68f 100644 --- a/install/package.json +++ b/install/package.json @@ -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", diff --git a/public/language/pt-BR/notifications.json b/public/language/pt-BR/notifications.json index 0eb34b27e5..2bda320456 100644 --- a/public/language/pt-BR/notifications.json +++ b/public/language/pt-BR/notifications.json @@ -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", diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index 96da2ef057..9efb1807be 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -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(); + } }); } }); diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 6c820cdd7f..87dcc38944 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -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) + '%'); }; diff --git a/src/groups/membership.js b/src/groups/membership.js index f11eebcc0b..864fdea81f 100644 --- a/src/groups/membership.js +++ b/src/groups/membership.js @@ -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); diff --git a/src/notifications.js b/src/notifications.js index 4bf9782e61..8a91c44509 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -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);