From 04900291dbc8cf878692a31e5c35f517dea04dbb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 19:26:31 -0500 Subject: [PATCH 1/8] fix(deps): update dependency nodebb-plugin-emoji to v3.5.17 (#10314) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index b475c13514..b72478e0b4 100644 --- a/install/package.json +++ b/install/package.json @@ -88,7 +88,7 @@ "nodebb-plugin-2factor": "3.0.4", "nodebb-plugin-composer-default": "7.0.20", "nodebb-plugin-dbsearch": "5.1.2", - "nodebb-plugin-emoji": "3.5.16", + "nodebb-plugin-emoji": "3.5.17", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "9.0.7", "nodebb-plugin-mentions": "3.0.5", From afd2993dfe0b7c0f03a3a7940bf57b47bf87f719 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 19:27:49 -0500 Subject: [PATCH 2/8] fix(deps): update dependency mongodb to v4.4.0 (#10319) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index b72478e0b4..4203b9d608 100644 --- a/install/package.json +++ b/install/package.json @@ -79,7 +79,7 @@ "material-design-lite": "1.3.0", "mime": "3.0.0", "mkdirp": "1.0.4", - "mongodb": "4.3.1", + "mongodb": "4.4.0", "morgan": "1.10.0", "mousetrap": "1.6.5", "multiparty": "4.2.3", From 21913b5b192d4b5f4074a225e59844e6e1161b39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 05:26:54 +0000 Subject: [PATCH 3/8] chore(deps): bump prompt from 1.2.1 to 1.2.2 in /install Bumps [prompt](https://github.com/flatiron/prompt) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/flatiron/prompt/releases) - [Changelog](https://github.com/flatiron/prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/flatiron/prompt/commits) --- updated-dependencies: - dependency-name: prompt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 4203b9d608..8f514c1dbe 100644 --- a/install/package.json +++ b/install/package.json @@ -108,7 +108,7 @@ "pg-cursor": "2.7.3", "postcss": "8.4.6", "postcss-clean": "1.2.0", - "prompt": "1.2.1", + "prompt": "1.2.2", "ioredis": "4.28.5", "request": "2.88.2", "request-promise-native": "1.0.9", From c17b9bd447917a409ca626f2c0a54cec07a1a386 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 14:42:13 -0500 Subject: [PATCH 4/8] fix(deps): update dependency nodebb-plugin-markdown to v9.0.8 (#10327) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 8f514c1dbe..ae342cd5dd 100644 --- a/install/package.json +++ b/install/package.json @@ -90,7 +90,7 @@ "nodebb-plugin-dbsearch": "5.1.2", "nodebb-plugin-emoji": "3.5.17", "nodebb-plugin-emoji-android": "2.0.5", - "nodebb-plugin-markdown": "9.0.7", + "nodebb-plugin-markdown": "9.0.8", "nodebb-plugin-mentions": "3.0.5", "nodebb-plugin-spam-be-gone": "0.7.13", "nodebb-rewards-essentials": "0.2.1", From 52836f3a7f815c0ca7f144f17205f012372325dd Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 18 Feb 2022 14:48:08 -0500 Subject: [PATCH 5/8] fix: allow translation keys in `label` attributes --- public/vendor/bootbox/wrapper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/vendor/bootbox/wrapper.js b/public/vendor/bootbox/wrapper.js index b37f675395..54e703fa31 100644 --- a/public/vendor/bootbox/wrapper.js +++ b/public/vendor/bootbox/wrapper.js @@ -23,7 +23,7 @@ require(['translator', 'bootbox'], function (shim, bootbox) { var translator = shim.Translator.create(); var dialog = bootbox.dialog; - var attrsToTranslate = ['placeholder', 'title', 'value']; + var attrsToTranslate = ['placeholder', 'title', 'value', 'label']; bootbox.dialog = function (options) { var show = options.show !== false; options.show = false; From 1fa413420177bb767140d5a5f20f9cd9360693aa Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 18 Feb 2022 14:49:15 -0500 Subject: [PATCH 6/8] fix: #10329, select elements in sorted-list not showing proper values --- public/src/modules/settings/sorted-list.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/public/src/modules/settings/sorted-list.js b/public/src/modules/settings/sorted-list.js index dba5da9bc0..c03e2ea6ed 100644 --- a/public/src/modules/settings/sorted-list.js +++ b/public/src/modules/settings/sorted-list.js @@ -92,9 +92,15 @@ define('settings/sorted-list', [ const editBtn = $('[data-sorted-list-uuid="' + itemUUID + '"] [data-type="edit"]'); editBtn.on('click', function () { - const form = $('[data-sorted-list-uuid="' + itemUUID + '"][data-sorted-list-object="' + key + '"]').clone(true).show(); + const form = $('[data-sorted-list-uuid="' + itemUUID + '"][data-sorted-list-object="' + key + '"]'); + const clone = form.clone(true).show(); - const modal = bootbox.confirm(form, function (save) { + // .clone() doesn't preserve the state of `select` elements, fixing after the fact + clone.find('select').each((idx, el) => { + el.value = form.find(`select#${el.id}`).val(); + }); + + const modal = bootbox.confirm(clone, function (save) { if (save) { const form = $('
'); form.append(modal.find('form').children()); From 1c1062e11b80600ae6247ce33788c97249af9a76 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 16:49:56 -0500 Subject: [PATCH 7/8] fix(deps): update dependency nodebb-plugin-dbsearch to v5.1.3 (#10330) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ae342cd5dd..611cdc3de2 100644 --- a/install/package.json +++ b/install/package.json @@ -87,7 +87,7 @@ "nconf": "0.11.3", "nodebb-plugin-2factor": "3.0.4", "nodebb-plugin-composer-default": "7.0.20", - "nodebb-plugin-dbsearch": "5.1.2", + "nodebb-plugin-dbsearch": "5.1.3", "nodebb-plugin-emoji": "3.5.17", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "9.0.8", From 31cbff19ed7df4a8c172b9fb5ae7b721a3d9696c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 17:16:16 -0500 Subject: [PATCH 8/8] fix(deps): update dependency nodebb-plugin-mentions to v3.0.6 (#10328) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 611cdc3de2..ad67a5a743 100644 --- a/install/package.json +++ b/install/package.json @@ -91,7 +91,7 @@ "nodebb-plugin-emoji": "3.5.17", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "9.0.8", - "nodebb-plugin-mentions": "3.0.5", + "nodebb-plugin-mentions": "3.0.6", "nodebb-plugin-spam-be-gone": "0.7.13", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "5.3.2",