From 7cc33d6db4e846ee6d35a1d9fe759a1b5683ad15 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Tue, 12 Jul 2022 19:00:23 +0000 Subject: [PATCH 01/12] chore: incrementing version number - v2.2.4 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 5db0a6f8d8..3183d45ebe 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "2.2.3", + "version": "2.2.4", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From 52f7ed643c6ca45a7c88cd7285b90b70b82f8242 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Tue, 12 Jul 2022 19:00:24 +0000 Subject: [PATCH 02/12] chore: update changelog for v2.2.4 --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bee03a77fc..51ba1b793f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,29 @@ +#### v2.2.4 (2022-07-12) + +##### Chores + +* **deps:** + * update docker/metadata-action action to v4 (42a45a71) + * bump ace-builds from 1.5.3 to 1.7.1 in /install (d568d2f5) + * bump winston from 3.8.0 to 3.8.1 in /install (26b73b39) + * bump ioredis from 5.0.6 to 5.1.0 in /install (0d55c42d) + * bump nodemailer from 6.7.5 to 6.7.7 in /install (bd37b286) +* **deps-dev:** + * bump @commitlint/cli from 17.0.2 to 17.0.3 in /install (9e44cdad) + * bump eslint from 8.18.0 to 8.19.0 in /install (7139ad5f) +* incrementing version number - v2.2.3 (f80476b9) +* update changelog for v2.2.3 (8719a93f) +* incrementing version number - v2.2.2 (343ffa66) +* incrementing version number - v2.2.1 (efc77b2a) +* incrementing version number - v2.2.0 (eecb836d) + +##### Bug Fixes + +* **deps:** update dependency diff to v5.1.0 (452e5bf7) +* #10733, extraneous apostrophes in plugin upgrader (3c41ae04) +* get version from install/package.json instead (60114219) +* #10739, always re-add theme to active plugins, on theme set (8d701ec3) + #### v2.2.3 (2022-07-05) ##### Chores From 8c20fdad9f67674a3e5ead374e10458b00ea8d6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 18:24:08 +0000 Subject: [PATCH 03/12] chore(deps): bump ioredis from 5.1.0 to 5.2.0 in /install Bumps [ioredis](https://github.com/luin/ioredis) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/luin/ioredis/releases) - [Changelog](https://github.com/luin/ioredis/blob/main/CHANGELOG.md) - [Commits](https://github.com/luin/ioredis/compare/v5.1.0...v5.2.0) --- updated-dependencies: - dependency-name: ioredis dependency-type: direct:production update-type: version-update:semver-minor ... 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 3183d45ebe..72a6d63bf5 100644 --- a/install/package.json +++ b/install/package.json @@ -111,7 +111,7 @@ "postcss": "8.4.14", "postcss-clean": "1.2.0", "prompt": "1.3.0", - "ioredis": "5.1.0", + "ioredis": "5.2.0", "request": "2.88.2", "request-promise-native": "1.0.9", "rimraf": "3.0.2", From 2a88a50fe54b3410f5d8a84edf929ddc2a12c4b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 18:30:06 +0000 Subject: [PATCH 04/12] chore(deps-dev): bump @commitlint/config-angular in /install Bumps [@commitlint/config-angular](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/config-angular) from 17.0.0 to 17.0.3. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/config-angular/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v17.0.3/@commitlint/config-angular) --- updated-dependencies: - dependency-name: "@commitlint/config-angular" dependency-type: direct:development 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 72a6d63bf5..acfa01cf67 100644 --- a/install/package.json +++ b/install/package.json @@ -148,7 +148,7 @@ "devDependencies": { "@apidevtools/swagger-parser": "10.0.3", "@commitlint/cli": "17.0.3", - "@commitlint/config-angular": "17.0.0", + "@commitlint/config-angular": "17.0.3", "coveralls": "3.1.1", "eslint": "8.19.0", "eslint-config-nodebb": "0.1.1", From 9e52b8c6482115cee8d272a24632f775058fa2d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Jul 2022 15:06:31 +0000 Subject: [PATCH 05/12] chore(deps): bump nodebb-theme-persona in /install Bumps [nodebb-theme-persona](https://github.com/NodeBB/nodebb-theme-persona) from 12.0.11 to 12.0.12. - [Release notes](https://github.com/NodeBB/nodebb-theme-persona/releases) - [Commits](https://github.com/NodeBB/nodebb-theme-persona/compare/v12.0.11...v12.0.12) --- updated-dependencies: - dependency-name: nodebb-theme-persona 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 acfa01cf67..af9fdeb176 100644 --- a/install/package.json +++ b/install/package.json @@ -97,7 +97,7 @@ "nodebb-plugin-spam-be-gone": "1.0.0", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", - "nodebb-theme-persona": "12.0.11", + "nodebb-theme-persona": "12.0.12", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", From bff239da99760149eeff2a4a9d23130e24bff376 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Jul 2022 18:41:12 +0000 Subject: [PATCH 06/12] fix(deps): update dependency mongodb to v4.8.0 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index af9fdeb176..64bc7399f4 100644 --- a/install/package.json +++ b/install/package.json @@ -81,7 +81,7 @@ "material-design-lite": "1.3.0", "mime": "3.0.0", "mkdirp": "1.0.4", - "mongodb": "4.7.0", + "mongodb": "4.8.0", "morgan": "1.10.0", "mousetrap": "1.6.5", "multiparty": "4.2.3", From abb19e981e90d266aa398da4e91658313a9b911e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 05:21:43 +0000 Subject: [PATCH 07/12] chore(deps): bump jquery-ui from 1.13.1 to 1.13.2 in /install Bumps [jquery-ui](https://github.com/jquery/jquery-ui) from 1.13.1 to 1.13.2. - [Release notes](https://github.com/jquery/jquery-ui/releases) - [Commits](https://github.com/jquery/jquery-ui/compare/1.13.1...1.13.2) --- updated-dependencies: - dependency-name: jquery-ui 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 64bc7399f4..b5173eb5b2 100644 --- a/install/package.json +++ b/install/package.json @@ -70,7 +70,7 @@ "jquery-deserialize": "2.0.0", "jquery-form": "4.3.0", "jquery-serializeobject": "1.0.0", - "jquery-ui": "1.13.1", + "jquery-ui": "1.13.2", "jsesc": "3.0.2", "json2csv": "5.0.7", "jsonwebtoken": "8.5.1", From 4c1bda32c90044fcc7f682d86bd5646631396711 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 05:21:26 +0000 Subject: [PATCH 08/12] chore(deps): bump cron from 2.0.0 to 2.1.0 in /install Bumps [cron](https://github.com/kelektiv/node-cron) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/kelektiv/node-cron/releases) - [Changelog](https://github.com/kelektiv/node-cron/blob/master/CHANGELOG.md) - [Commits](https://github.com/kelektiv/node-cron/compare/v2.0.0...v2.1.0) --- updated-dependencies: - dependency-name: cron dependency-type: direct:production update-type: version-update:semver-minor ... 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 b5173eb5b2..afdcc27744 100644 --- a/install/package.json +++ b/install/package.json @@ -52,7 +52,7 @@ "connect-pg-simple": "7.0.0", "connect-redis": "6.1.3", "cookie-parser": "1.4.6", - "cron": "2.0.0", + "cron": "2.1.0", "cropperjs": "1.5.12", "csurf": "1.11.0", "daemon": "1.1.0", From 0d58e8a6af29fb8006eeaf90251db43ceb814fea Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 15 Jul 2022 14:57:37 -0400 Subject: [PATCH 09/12] fix: remove extraneous console.log --- src/cli/upgrade-plugins.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/cli/upgrade-plugins.js b/src/cli/upgrade-plugins.js index 0d2e55d25f..e789993388 100644 --- a/src/cli/upgrade-plugins.js +++ b/src/cli/upgrade-plugins.js @@ -100,8 +100,6 @@ async function checkPlugins() { const suggestedModules = await getSuggestedModules(nbbVersion, toCheck); process.stdout.write(chalk.green(' OK')); - console.log(plugins, suggestedModules); - let current; let suggested; const upgradable = suggestedModules.map((suggestObj) => { From 8d109fef47fddb026a8ffa8fe950134011b2607c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 05:28:04 +0000 Subject: [PATCH 10/12] chore(deps-dev): bump eslint from 8.19.0 to 8.20.0 in /install Bumps [eslint](https://github.com/eslint/eslint) from 8.19.0 to 8.20.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.19.0...v8.20.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... 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 afdcc27744..af6c6c4a07 100644 --- a/install/package.json +++ b/install/package.json @@ -150,7 +150,7 @@ "@commitlint/cli": "17.0.3", "@commitlint/config-angular": "17.0.3", "coveralls": "3.1.1", - "eslint": "8.19.0", + "eslint": "8.20.0", "eslint-config-nodebb": "0.1.1", "eslint-plugin-import": "2.26.0", "grunt": "1.5.3", From 6f88894cb96a697330e25beb53c8e55d04871a98 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 20 Jul 2022 09:07:57 +0000 Subject: [PATCH 11/12] Latest translations and fallbacks --- public/language/he/modules.json | 2 +- public/language/he/topic.json | 58 ++++++++++++++++----------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/public/language/he/modules.json b/public/language/he/modules.json index c4c0a22ee9..00fd7aea25 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -44,7 +44,7 @@ "composer.hide_preview": "הסתר תצוגה מקדימה", "composer.user_said_in": "%1 אמר ב%2:", "composer.user_said": "%1 אמר:", - "composer.discard": "האם למחוק פוסט זה?", + "composer.discard": "האם לבטל את השינויים שנעשו בפוסט זה?", "composer.submit_and_lock": "אשר ונעל", "composer.toggle_dropdown": "הדלק/כבה את התפריט הנפתח", "composer.uploading": "העלאה %1", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index 85be37618b..14a9021f7e 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -89,11 +89,11 @@ "thread_tools.fork": "פצל נושא", "thread_tools.delete": "מחק נושא", "thread_tools.delete-posts": "מחק פוסטים", - "thread_tools.delete_confirm": "האם אתה בטוח שאתה רוצה למחוק נושא זה?", + "thread_tools.delete_confirm": "האם למחוק נושא זה?", "thread_tools.restore": "שחזר נושא", - "thread_tools.restore_confirm": "האם אתה בטוח שאתה רוצה לשחזר נושא זה?", + "thread_tools.restore_confirm": "האם לשחזר נושא זה?", "thread_tools.purge": "מחק נושא", - "thread_tools.purge_confirm": "האם אתה בטוח שאתה רוצה למחוק נושא זה?", + "thread_tools.purge_confirm": "האם לטהר נושא זה?", "thread_tools.merge_topics": "מזג נושאים", "thread_tools.merge": "מזג", "topic_move_success": "נושא זה יועבר מיד ל\"%1\". לחץ כאן כדי לבטל.", @@ -102,57 +102,57 @@ "topic_move_undone": "העברת הנושא בוטל", "topic_move_posts_success": "הפוסטים יועברו בקרוב. לחץ כאן לביטול.", "topic_move_posts_undone": "העברת הפוסט בוטל", - "post_delete_confirm": "האם אתה בטוח שאתה רוצה למחוק פוסט זה?", - "post_restore_confirm": "האם אתה בטוח שאתה רוצה לשחזר פוסט זה?", - "post_purge_confirm": "האם אתה בטוח שאתה רוצה למחוק פוסט זה?", + "post_delete_confirm": "האם למחוק פוסט זה?", + "post_restore_confirm": "האם לשחזר פוסט זה?", + "post_purge_confirm": "האם לטהר פוסט זה?", "pin-modal-expiry": "תאריך תפוגה", - "pin-modal-help": "באפשרותך להגדיר כאן תאריך תפוגה לנושא(ים) המוצמד(ים). לחלופין, אתה יכול להשאיר שדה זה ריק כדי שהנושא יישאר נעוץ עד לביטול ההצמדה ידנית.", + "pin-modal-help": "באפשרותכם להגדיר כאן תאריך תפוגה לנושא(ים) המוצמד(ים). לחלופין, ביכולתכם להשאיר שדה זה ריק, כדי שהנושא יישאר נעוץ עד לביטול ההצמדה ידנית.", "load_categories": "טוען קטגוריות", "confirm_move": "הזז", "confirm_fork": "פצל", "bookmark": "הוסף למועדפים", "bookmarks": "מועדפים", "bookmarks.has_no_bookmarks": "לא צירפת פוסט למועדפים עדיין", - "copy-permalink": "Copy Permalink", + "copy-permalink": "העתקת קישור-קבוע", "loading_more_posts": "טוען פוסטים נוספים", - "move_topic": "הזז נושא", - "move_topics": "הזז נושאים", - "move_post": "הזז פוסט", + "move_topic": "הזזת נושא", + "move_topics": "הזזת נושאים", + "move_post": "הזזת פוסט", "post_moved": "הפוסט הועבר!", - "fork_topic": "פצל נושא", - "enter-new-topic-title": "הכנס כותרת נושא חדשה", - "fork_topic_instruction": "לחץ על הפוסטים שברצונך לפצל", + "fork_topic": "פיצול נושא", + "enter-new-topic-title": "הכניסו כותרת נושא חדשה", + "fork_topic_instruction": "לחצו על הפוסטים שברצונכם לפצל", "fork_no_pids": "לא נבחרו פוסטים!", "no-posts-selected": "לא נבחרו פוסטים!", "x-posts-selected": "%1 פוסט(ים) נבחרו", "x-posts-will-be-moved-to-y": "%1 פוסט(ים) יועברו ל-\"%2\"", "fork_pid_count": "%1 פוסט(ים) נבחרו", - "fork_success": "הפוסט פוצל בהצלחה! לחץ כאן על מנת לעבור לפוסט המפוצל.", - "delete_posts_instruction": "לחץ על הפוסטים שברצונך למחוק", - "merge_topics_instruction": "לחץ על הנושאים שברצונך למזג או חפש אותם", + "fork_success": "הפוסט פוצל בהצלחה! לחצו כאן על מנת לעבור לפוסט המפוצל.", + "delete_posts_instruction": "לחצו על הפוסטים שברצונכם למחוק", + "merge_topics_instruction": "לחצו על הנושאים שברצונכם למזג או חפשו אותם", "merge-topic-list-title": "רשימת הנושאים למיזוג", "merge-options": "אפשרויות מיזוג", - "merge-select-main-topic": "בחר את הכותרת המועדפת", + "merge-select-main-topic": "בחרו את הכותרת הראשית", "merge-new-title-for-topic": "כותרת חדשה לנושא", "topic-id": "מזהה נושא", - "move_posts_instruction": "לחץ על הפוסטים שברצונך להסיר ואז הכנס מזהה נושא או עבור לנושא היעד", - "change_owner_instruction": "לחץ על הפוסטים עליהם תרצה לשנות את כותב ההודעה", - "composer.title_placeholder": "הכנס את כותרת הנושא כאן...", - "composer.handle_placeholder": "הזן את שמך / כינוי שלך כאן", + "move_posts_instruction": "לחצו על הפוסטים שברצונכם להסיר ואז הכניסו מזהה נושא או עברו לנושא היעד", + "change_owner_instruction": "לחצו על הפוסטים בהם תרצו לשנות את שם כותב ההודעה", + "composer.title_placeholder": "הכניסו את כותרת הנושא כאן...", + "composer.handle_placeholder": "הזינו את שמכם / כינוי שלכם כאן", "composer.discard": "ביטול", - "composer.submit": "שלח", + "composer.submit": "שליחה", "composer.additional-options": "אפשרויות נוספות", - "composer.schedule": "תזמן", + "composer.schedule": "תיזמון", "composer.replying_to": "מגיב ל%1", "composer.new_topic": "נושא חדש", "composer.editing": "עורך", "composer.uploading": "מעלה...", - "composer.thumb_url_label": "הדבק את כתובת ה-URL לתמונה מוקטנת עבור הנושא", - "composer.thumb_title": "הוסף תמונה מוקטנת לנושא זה", + "composer.thumb_url_label": "הדביקו את כתובת ה-URL לתמונה מוקטנת עבור הנושא", + "composer.thumb_title": "הוסיפו תמונה מוקטנת לנושא זה", "composer.thumb_url_placeholder": "http://example.com/thumb.png", - "composer.thumb_file_label": "או העלה קובץ", - "composer.thumb_remove": "נקה שדות", - "composer.drag_and_drop_images": "גרור תמונות לכאן", + "composer.thumb_file_label": "או העלו קובץ", + "composer.thumb_remove": "ניקוי שדות", + "composer.drag_and_drop_images": "גררו תמונות לכאן", "more_users_and_guests": "%1 משתמש(ים) נוספים ו-%2 אורח(ים)", "more_users": "%1 משתמשים נוספים", "more_guests": "%1 אורחים נוספים", From c93bd0105e9e0d3a5350f8e730c2792ee9515ca0 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 20 Jul 2022 17:02:27 -0400 Subject: [PATCH 12/12] fix: expire email validation tokens on password change --- src/user/profile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/user/profile.js b/src/user/profile.js index 66ca35d789..fc238ff87c 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -327,6 +327,7 @@ module.exports = function (User) { User.reset.cleanByUid(data.uid), User.reset.updateExpiry(data.uid), User.auth.revokeAllSessions(data.uid), + User.email.expireValidation(data.uid), ]); plugins.hooks.fire('action:password.change', { uid: uid, targetUid: data.uid });