From 92d3844988126041b67459d8177ab593d10b7a25 Mon Sep 17 00:00:00 2001 From: RoiEX <8350879+RoiEXLab@users.noreply.github.com> Date: Thu, 18 Jan 2018 19:29:55 +0100 Subject: [PATCH 1/6] Start reading progress at 0 --- public/src/modules/navigator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) + '%'); }; From c62e5f8130df07ad3e6d270c8c6292b95444f849 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 30 Jan 2018 14:06:09 -0500 Subject: [PATCH 2/6] bumping composer version --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index dcf98231f3..f957023191 100644 --- a/install/package.json +++ b/install/package.json @@ -59,7 +59,7 @@ "morgan": "^1.9.0", "mousetrap": "^1.6.1", "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.0.9", "nodebb-plugin-emoji-android": "2.0.0", From a5bae451f2b7eb6531dbfe14901b85170ff36f22 Mon Sep 17 00:00:00 2001 From: Andrew Rodrigues Date: Tue, 30 Jan 2018 19:53:38 -0500 Subject: [PATCH 3/6] strip html tags from email subject --- src/notifications.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/notifications.js b/src/notifications.js index 4bf9782e61..2c43276907 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -220,7 +220,7 @@ 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 || ''), showUnsubscribe: true, From 9e0189ab34d6ef4e6348dad1562d9c3299fd5617 Mon Sep 17 00:00:00 2001 From: Andrew Rodrigues Date: Tue, 30 Jan 2018 20:43:30 -0500 Subject: [PATCH 4/6] added notification obj to emailer.send --- src/notifications.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/notifications.js b/src/notifications.js index 2c43276907..8a91c44509 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -223,6 +223,7 @@ function pushToUids(uids, notification, callback) { 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); From 211f00282c093c976a82c7d5c48da023fb0f6e9a Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 31 Jan 2018 09:25:24 +0000 Subject: [PATCH 5/6] Latest translations and fallbacks --- public/language/pt-BR/notifications.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From 8689ffe78fd85e7dc6c1b9dd068c4695880e4ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 31 Jan 2018 12:25:06 -0500 Subject: [PATCH 6/6] closes #6291 --- public/src/admin/manage/users.js | 6 ++++++ src/groups/membership.js | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) 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/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);