From 665f36b707c879472ef4158093dd335809fddb0f Mon Sep 17 00:00:00 2001 From: Opliko Date: Sat, 3 Sep 2022 15:58:04 +0300 Subject: [PATCH 001/150] feat: add quiet to action:settings.set Makes it possible to ignore quiet updates without abusing the `filter` hook --- src/meta/settings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/meta/settings.js b/src/meta/settings.js index 1207d13734..213b61be11 100644 --- a/src/meta/settings.js +++ b/src/meta/settings.js @@ -95,6 +95,7 @@ Settings.set = async function (hash, values, quiet) { plugins.hooks.fire('action:settings.set', { plugin: hash, settings: { ...values, ...sortedListData }, // Add back sorted list data to values hash + quiet, }); pubsub.publish(`action:settings.set.${hash}`, values); From bdfacb8903e0d20f5c25d4a3e2afd4ab0edd3ebb Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sun, 4 Sep 2022 09:24:00 +0000 Subject: [PATCH 002/150] Latest translations and fallbacks --- public/language/sr/error.json | 4 ++-- public/language/sr/user.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/sr/error.json b/public/language/sr/error.json index 0e27c0d5c0..ad5e181e66 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -205,8 +205,8 @@ "no-connection": "Изгледа да постоји проблем са вашом интернет везом", "socket-reconnect-failed": "Тренутно није могуће приступити серверу. Кликните овде да бисте покушали поново или покушајте поново касније", "plugin-not-whitelisted": "Инсталација додатне компоненте &ndash није могућа; преко ACP-а могу се инсталирати само додатне компоненте које је на белој листи ставио NodeBB Package Manager", - "plugins-set-in-configuration": "You are not allowed to change plugin state as they are defined at runtime (config.json, environmental variables or terminal arguments), please modify the configuration instead.", - "theme-not-set-in-configuration": "When defining active plugins in configuration, changing themes requires adding the new theme to the list of active plugins before updating it in the ACP", + "plugins-set-in-configuration": "Није вам дозвољено да мењате стање додатне компоненте онако како је дефинисано у време извршавања (config.json, променљиве окружења или аргументи терминала), уместо тога измените конфигурацију.", + "theme-not-set-in-configuration": "Приликом дефинисања активних додатних компоненти у конфигурацији, промена тема захтева додавање нове теме на листу активних додатних компоненти пре ажурирања у ACP", "topic-event-unrecognized": "Догађај из теме „%1“ није препознат", "cant-set-child-as-parent": "Није могуће поставити подређену категорију као надређену", "cant-set-self-as-parent": "Није могуће поставити себе као надређену категорију", diff --git a/public/language/sr/user.json b/public/language/sr/user.json index b30dc871fa..6c2bca7c1f 100644 --- a/public/language/sr/user.json +++ b/public/language/sr/user.json @@ -195,5 +195,5 @@ "emailUpdate.optional": "Ово поље је опционо. Нисте обавезни да наведете своју адресу е-поште, али без ваљане е-поште нећете моћи да вратите свој налог или да се пријавите помоћу своје е-поште.", "emailUpdate.required": "Ово поље је обавезно.", "emailUpdate.change-instructions": "На унету адресу е-поште биће послата потврдна порука са јединственом везом. Приступ тој вези потврдиће ваше власништво над адресом е-поште и она ће постати активна на вашем налогу. У било ком тренутку можете да ажурирате своју е-пошту на страници налога.", - "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership." + "emailUpdate.password-challenge": "Унесите лозинку да бисте потврдили власништво над налогом." } \ No newline at end of file From 29ddeaa1e215426ac645a1a5906e00f8465d901d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 9 Sep 2022 15:14:06 -0400 Subject: [PATCH 003/150] fix(deps): bump composer-default to v9.2.0 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 3a1c865b5e..fb2e2f8d1d 100644 --- a/install/package.json +++ b/install/package.json @@ -89,7 +89,7 @@ "@nodebb/bootswatch": "3.4.2", "nconf": "0.12.0", "nodebb-plugin-2factor": "5.0.2", - "nodebb-plugin-composer-default": "9.1.1", + "nodebb-plugin-composer-default": "9.2.0", "nodebb-plugin-dbsearch": "5.1.5", "nodebb-plugin-emoji": "4.0.4", "nodebb-plugin-emoji-android": "3.0.0", From bf9bb489ad37fa108a34c2c5aab57d6b72917e77 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sat, 10 Sep 2022 09:06:15 +0000 Subject: [PATCH 004/150] Latest translations and fallbacks --- public/language/he/topic.json | 2 +- public/language/he/user.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/language/he/topic.json b/public/language/he/topic.json index e9f6dc897d..f36bf4277e 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -113,7 +113,7 @@ "bookmark": "הוספה למועדפים", "bookmarks": "מועדפים", "bookmarks.has_no_bookmarks": "לא צירפתם פוסט למועדפים עדיין", - "copy-permalink": "העתקת קישור ישיר", + "copy-permalink": "העתקת קישור פוסט", "loading_more_posts": "טוען פוסטים נוספים", "move_topic": "העברת נושא", "move_topics": "העברת נושאים", diff --git a/public/language/he/user.json b/public/language/he/user.json index bc41b57ba7..285b3b7c28 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -92,8 +92,8 @@ "show_email": "הצג את כתובת האימייל שלי", "show_fullname": "הצג את שמי המלא", "restrict_chats": "אשר הודעות צ'אט ממשתמשים שאני עוקב אחריהם בלבד", - "digest_label": "הרשם לקבלת תקציר", - "digest_description": "הירשם לקבלת עדכונים בדואר אלקטרוני מפורום זה (הודעות ונושאים חדשים) בהתאם ללוח זמנים מוגדר מראש", + "digest_label": "הרשמה לקבלת תקציר", + "digest_description": "הרשמה לקבלת עדכונים בדואר אלקטרוני מפורום זה (הודעות ונושאים חדשים) בהתאם ללוח זמנים מוגדר מראש", "digest_off": "כבוי", "digest_daily": "יומי", "digest_weekly": "שבועי", @@ -109,10 +109,10 @@ "has_no_upvoted_posts": "המשתמש טרם הצביע בעד פוסטים כלשהם.", "has_no_downvoted_posts": "המשתמש טרם הצביע נגד פוסטים כלשהם.", "has_no_controversial_posts": "למשתמש זה אין עדיין פוסטים עם הצבעה למטה.", - "has_no_blocks": "לא חסמת אף משתמש.", + "has_no_blocks": "לא חסמתם אף משתמש.", "email_hidden": "כתובת אימייל מוסתרת", "hidden": "מוסתר", - "paginate_description": "הצג נושאים ופוסטים בעמודים במקום כרשימת גלילה אין-סופית", + "paginate_description": "הצגת נושאים ופוסטים בעמודים במקום כרשימת גלילה אין-סופית", "topics_per_page": "כמות נושאים בעמוד", "posts_per_page": "כמות פוסטים בעמוד", "max_items_per_page": "מקסימום %1", From 881c7c4d181d31f2995a0de4533ff4a743ee9daf Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 12 Sep 2022 13:01:19 -0400 Subject: [PATCH 005/150] fix: automatically remove `lang` parameter if it matches the forum default --- public/src/modules/messages.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/src/modules/messages.js b/public/src/modules/messages.js index 724d6886f1..32017e329e 100644 --- a/public/src/modules/messages.js +++ b/public/src/modules/messages.js @@ -101,6 +101,11 @@ define('messages', ['bootbox', 'translator', 'storage', 'alerts', 'hooks'], func params.delete('register'); } + if (params.has('lang') && params.get('lang') === config.defaultLang) { + console.info(`The "lang" parameter was passed in to set the language to "${params.get('lang')}", but that is already the forum default language.`); + params.delete('lang'); + } + const qs = params.toString(); ajaxify.updateHistory(ajaxify.currentPage + (qs ? `?${qs}` : '') + document.location.hash, true); } From c0c3ee0189b807ab09a217a1c7482518c5ffd5ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 09:36:25 -0400 Subject: [PATCH 006/150] fix(deps): update dependency ace-builds to v1.10.1 (#10840) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index fb2e2f8d1d..9c963160a0 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.0", - "ace-builds": "1.9.5", + "ace-builds": "1.10.1", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.8", From 6687f49bda30b55742506e4efcb1b3178d22a85b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 09:51:49 -0400 Subject: [PATCH 007/150] fix(deps): update dependency jquery to v3.6.1 (#10868) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 9c963160a0..59c1ca9145 100644 --- a/install/package.json +++ b/install/package.json @@ -67,7 +67,7 @@ "helmet": "5.1.1", "html-to-text": "8.2.1", "ipaddr.js": "2.0.1", - "jquery": "3.6.0", + "jquery": "3.6.1", "jquery-deserialize": "2.0.0", "jquery-form": "4.3.0", "jquery-serializeobject": "1.0.0", From 8c680db5bd50d2f259e07aab8df93563535038d1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 10:21:55 -0400 Subject: [PATCH 008/150] fix(deps): update dependency postcss to v8.4.16 (#10824) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 59c1ca9145..a4b8036269 100644 --- a/install/package.json +++ b/install/package.json @@ -109,7 +109,7 @@ "passport-local": "1.0.0", "pg": "8.7.3", "pg-cursor": "2.7.3", - "postcss": "8.4.14", + "postcss": "8.4.16", "postcss-clean": "1.2.0", "prompt": "1.3.0", "ioredis": "5.2.2", From cc6798bb1165b0047e2d20b90eb06686439cf1b0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 10:22:11 -0400 Subject: [PATCH 009/150] fix(deps): update dependency autoprefixer to v10.4.9 (#10879) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index a4b8036269..9abfd61c2c 100644 --- a/install/package.json +++ b/install/package.json @@ -33,7 +33,7 @@ "ace-builds": "1.10.1", "archiver": "5.3.1", "async": "3.2.4", - "autoprefixer": "10.4.8", + "autoprefixer": "10.4.9", "bcryptjs": "2.4.3", "benchpressjs": "2.4.3", "body-parser": "1.20.0", From 5583ab95622b5c3120d7f23c3d51fac7f28b5149 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 10:45:03 -0400 Subject: [PATCH 010/150] fix(deps): update dependency mongodb to v4.9.1 (#10880) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 9abfd61c2c..f7765d2730 100644 --- a/install/package.json +++ b/install/package.json @@ -82,7 +82,7 @@ "material-design-lite": "1.3.0", "mime": "3.0.0", "mkdirp": "1.0.4", - "mongodb": "4.9.0", + "mongodb": "4.9.1", "morgan": "1.10.0", "mousetrap": "1.6.5", "multiparty": "4.2.3", From 86b63fab9d3a785536506a957ef00c5ffac317a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 10:46:09 -0400 Subject: [PATCH 011/150] fix(deps): update dependency pg-cursor to v2.7.4 (#10862) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index f7765d2730..e5ed4b442b 100644 --- a/install/package.json +++ b/install/package.json @@ -108,7 +108,7 @@ "passport-http-bearer": "1.0.1", "passport-local": "1.0.0", "pg": "8.7.3", - "pg-cursor": "2.7.3", + "pg-cursor": "2.7.4", "postcss": "8.4.16", "postcss-clean": "1.2.0", "prompt": "1.3.0", From 5e375e4af52dffe64106d5ac3da472002bbc3c35 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 10:49:07 -0400 Subject: [PATCH 012/150] fix(deps): update dependency ioredis to v5.2.3 (#10861) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index e5ed4b442b..adb435014f 100644 --- a/install/package.json +++ b/install/package.json @@ -112,7 +112,7 @@ "postcss": "8.4.16", "postcss-clean": "1.2.0", "prompt": "1.3.0", - "ioredis": "5.2.2", + "ioredis": "5.2.3", "request": "2.88.2", "request-promise-native": "1.0.9", "rimraf": "3.0.2", From 34d243e49b62ca2c08092b8c987664d4bd96eb18 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 10:49:30 -0400 Subject: [PATCH 013/150] fix(deps): update dependency nodebb-plugin-emoji to v4.0.5 (#10881) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index adb435014f..ebce07f59a 100644 --- a/install/package.json +++ b/install/package.json @@ -91,7 +91,7 @@ "nodebb-plugin-2factor": "5.0.2", "nodebb-plugin-composer-default": "9.2.0", "nodebb-plugin-dbsearch": "5.1.5", - "nodebb-plugin-emoji": "4.0.4", + "nodebb-plugin-emoji": "4.0.5", "nodebb-plugin-emoji-android": "3.0.0", "nodebb-plugin-markdown": "10.1.0", "nodebb-plugin-mentions": "3.0.11", From 01129a3994f7bd7ad32b0469f325590505f82774 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 11:11:31 -0400 Subject: [PATCH 014/150] fix(deps): update dependency pg to v8.8.0 (#10863) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ebce07f59a..4ac19f7c0c 100644 --- a/install/package.json +++ b/install/package.json @@ -107,7 +107,7 @@ "passport": "0.6.0", "passport-http-bearer": "1.0.1", "passport-local": "1.0.0", - "pg": "8.7.3", + "pg": "8.8.0", "pg-cursor": "2.7.4", "postcss": "8.4.16", "postcss-clean": "1.2.0", From d911a1bfb666d77ef5f4c02858bd0e4e4978b9fa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 11:11:49 -0400 Subject: [PATCH 015/150] fix(deps): update dependency winston to v3.8.2 (#10882) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 4ac19f7c0c..4e0ca3a2d9 100644 --- a/install/package.json +++ b/install/package.json @@ -138,7 +138,7 @@ "validator": "13.7.0", "webpack": "5.74.0", "webpack-merge": "5.8.0", - "winston": "3.8.1", + "winston": "3.8.2", "xml": "1.0.1", "xregexp": "5.1.1", "yargs": "17.5.1", From 0c2a88de06d192c038777e226b1fbd11f9618f7b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 11:38:41 -0400 Subject: [PATCH 016/150] fix(deps): update dependency autoprefixer to v10.4.10 (#10883) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 4e0ca3a2d9..e4cd3d1a6d 100644 --- a/install/package.json +++ b/install/package.json @@ -33,7 +33,7 @@ "ace-builds": "1.10.1", "archiver": "5.3.1", "async": "3.2.4", - "autoprefixer": "10.4.9", + "autoprefixer": "10.4.10", "bcryptjs": "2.4.3", "benchpressjs": "2.4.3", "body-parser": "1.20.0", From 0c6fb6e351d2acddf4f4520c50508a60f530df6b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 12:25:21 -0400 Subject: [PATCH 017/150] chore(deps): update dependency eslint to v8.23.1 (#10885) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index e4cd3d1a6d..237aa06cd8 100644 --- a/install/package.json +++ b/install/package.json @@ -149,7 +149,7 @@ "@commitlint/cli": "17.0.3", "@commitlint/config-angular": "17.0.3", "coveralls": "3.1.1", - "eslint": "8.22.0", + "eslint": "8.23.1", "eslint-config-nodebb": "0.1.1", "eslint-plugin-import": "2.26.0", "grunt": "1.5.3", From 335990beaeee14a74ce1a93c376e20e72f4d91e9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 12:26:18 -0400 Subject: [PATCH 018/150] fix(deps): update dependency nodebb-plugin-2factor to v5.1.0 (#10886) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 237aa06cd8..76e19cda19 100644 --- a/install/package.json +++ b/install/package.json @@ -88,7 +88,7 @@ "multiparty": "4.2.3", "@nodebb/bootswatch": "3.4.2", "nconf": "0.12.0", - "nodebb-plugin-2factor": "5.0.2", + "nodebb-plugin-2factor": "5.1.0", "nodebb-plugin-composer-default": "9.2.0", "nodebb-plugin-dbsearch": "5.1.5", "nodebb-plugin-emoji": "4.0.5", From 22f3d0bb4b73f57b931fcaaf7319a72aa3ffaa25 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 12:30:47 -0400 Subject: [PATCH 019/150] fix(deps): update socket.io packages to v4.5.2 (#10884) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 76e19cda19..b0d5832680 100644 --- a/install/package.json +++ b/install/package.json @@ -123,8 +123,8 @@ "sharp": "0.30.7", "sitemap": "7.1.1", "slideout": "1.0.1", - "socket.io": "4.5.1", - "socket.io-client": "4.5.1", + "socket.io": "4.5.2", + "socket.io-client": "4.5.2", "@socket.io/redis-adapter": "7.2.0", "sortablejs": "1.15.0", "spdx-license-list": "6.6.0", From c039a699bd7778a1e53a2fcf5af71be68dedd1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 13 Sep 2022 12:36:13 -0400 Subject: [PATCH 020/150] sharp test fix --- test/uploads.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/uploads.js b/test/uploads.js index 8e851d153d..5be0818b5e 100644 --- a/test/uploads.js +++ b/test/uploads.js @@ -212,7 +212,7 @@ describe('Upload Controllers', () => { assert.ifError(err); assert.strictEqual(res.statusCode, 500); assert(body && body.status && body.status.message); - assert(body.status.message.startsWith('Input file has corrupt header: pngload: end of stream')); + assert.strictEqual(body.status.message, 'Input file contains unsupported image format'); done(); }); }); From 2836be5cfaa383c66fe80a12c044efe24f81d21b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 13:21:34 -0400 Subject: [PATCH 021/150] fix(deps): update dependency sharp to v0.31.0 (#10887) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index b0d5832680..22bf579efd 100644 --- a/install/package.json +++ b/install/package.json @@ -120,7 +120,7 @@ "sanitize-html": "2.7.1", "semver": "7.3.7", "serve-favicon": "2.5.0", - "sharp": "0.30.7", + "sharp": "0.31.0", "sitemap": "7.1.1", "slideout": "1.0.1", "socket.io": "4.5.2", From ebd7c05c4cc1e6c016e504e78dde71a9bf70527f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 14 Sep 2022 09:27:08 -0400 Subject: [PATCH 022/150] feat: paginate recentposts.rss and category/1/recentposts.rss --- src/categories/recentreplies.js | 12 ++++++++---- src/routes/feeds.js | 13 ++++++++++--- src/socket.io/categories.js | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js index 0e5618b4fe..c7ab8e2fa7 100644 --- a/src/categories/recentreplies.js +++ b/src/categories/recentreplies.js @@ -1,6 +1,7 @@ 'use strict'; +const winston = require('winston'); const _ = require('lodash'); const db = require('../database'); @@ -11,11 +12,14 @@ const plugins = require('../plugins'); const batch = require('../batch'); module.exports = function (Categories) { - Categories.getRecentReplies = async function (cid, uid, count) { - if (!parseInt(count, 10)) { - return []; + Categories.getRecentReplies = async function (cid, uid, start, stop) { + // backwards compatibility, treat start as count + if (stop === undefined && start > 0) { + winston.warn('[Categories.getRecentReplies] 3 params deprecated please use Categories.getRecentReplies(cid, uid, start, stop)'); + stop = start - 1; + start = 0; } - let pids = await db.getSortedSetRevRange(`cid:${cid}:pids`, 0, count - 1); + let pids = await db.getSortedSetRevRange(`cid:${cid}:pids`, start, stop); pids = await privileges.posts.filter('topics:read', pids, uid); return await posts.getPostSummaryByPids(pids, uid, { stripTags: true }); }; diff --git a/src/routes/feeds.js b/src/routes/feeds.js index c3bda30473..fbd8de7072 100644 --- a/src/routes/feeds.js +++ b/src/routes/feeds.js @@ -307,7 +307,11 @@ async function generateForRecentPosts(req, res, next) { if (meta.config['feeds:disableRSS']) { return next(); } - const postData = await posts.getRecentPosts(req.uid, 0, 19, 'month'); + const page = parseInt(req.query.page, 10) || 1; + const postsPerPage = 20; + const start = Math.max(0, (page - 1) * postsPerPage); + const stop = start + postsPerPage - 1; + const postData = await posts.getRecentPosts(req.uid, start, stop, 'month'); const feed = generateForPostsFeed({ title: 'Recent Posts', description: 'A list of recent posts', @@ -323,11 +327,14 @@ async function generateForCategoryRecentPosts(req, res) { return controllers404.handle404(req, res); } const cid = req.params.category_id; - + const page = parseInt(req.query.page, 10) || 1; + const topicsPerPage = 20; + const start = Math.max(0, (page - 1) * topicsPerPage); + const stop = start + topicsPerPage - 1; const [userPrivileges, category, postData] = await Promise.all([ privileges.categories.get(cid, req.uid), categories.getCategoryData(cid), - categories.getRecentReplies(cid, req.uid || req.query.uid || 0, 20), + categories.getRecentReplies(cid, req.uid || req.query.uid || 0, start, stop), ]); if (!category) { diff --git a/src/socket.io/categories.js b/src/socket.io/categories.js index ad72658f70..0a90698115 100644 --- a/src/socket.io/categories.js +++ b/src/socket.io/categories.js @@ -10,7 +10,7 @@ const SocketCategories = module.exports; require('./categories/search')(SocketCategories); SocketCategories.getRecentReplies = async function (socket, cid) { - return await categories.getRecentReplies(cid, socket.uid, 4); + return await categories.getRecentReplies(cid, socket.uid, 0, 4); }; SocketCategories.get = async function (socket) { From 0758655a36745385fd8d2093e6b8c106e00e4f31 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Sep 2022 15:33:15 -0400 Subject: [PATCH 023/150] fix(deps): update dependency autoprefixer to v10.4.11 (#10892) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 22bf579efd..fec6773bc1 100644 --- a/install/package.json +++ b/install/package.json @@ -33,7 +33,7 @@ "ace-builds": "1.10.1", "archiver": "5.3.1", "async": "3.2.4", - "autoprefixer": "10.4.10", + "autoprefixer": "10.4.11", "bcryptjs": "2.4.3", "benchpressjs": "2.4.3", "body-parser": "1.20.0", From ca92345c480de8be75355e25a5f1acd86062b719 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Thu, 15 Sep 2022 09:06:37 +0000 Subject: [PATCH 024/150] Latest translations and fallbacks --- public/language/zh-CN/admin/menu.json | 2 +- public/language/zh-CN/admin/settings/pagination.json | 2 +- public/language/zh-CN/global.json | 2 +- public/language/zh-CN/modules.json | 4 ++-- public/language/zh-CN/notifications.json | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/language/zh-CN/admin/menu.json b/public/language/zh-CN/admin/menu.json index 8857255b41..2e456615c0 100644 --- a/public/language/zh-CN/admin/menu.json +++ b/public/language/zh-CN/admin/menu.json @@ -76,7 +76,7 @@ "logout": "登出", "view-forum": "查看论坛", - "search.placeholder": "Search settings", + "search.placeholder": "搜索设置", "search.no-results": "没有可用结果…", "search.search-forum": "搜索论坛为", "search.keep-typing": "输入更多以查看结果...", diff --git a/public/language/zh-CN/admin/settings/pagination.json b/public/language/zh-CN/admin/settings/pagination.json index 8269cbc4be..f3565fb555 100644 --- a/public/language/zh-CN/admin/settings/pagination.json +++ b/public/language/zh-CN/admin/settings/pagination.json @@ -1,7 +1,7 @@ { "pagination": "分页设置", "enable": "在主题和帖子使用分页替代无限滚动浏览。", - "posts": "Post Pagination", + "posts": "帖子分页", "topics": "话题分页", "posts-per-page": "每页帖子数", "max-posts-per-page": "每页最多帖子数", diff --git a/public/language/zh-CN/global.json b/public/language/zh-CN/global.json index f032d779d1..cd05e59b55 100644 --- a/public/language/zh-CN/global.json +++ b/public/language/zh-CN/global.json @@ -23,7 +23,7 @@ "close": "关闭", "pagination": "分页", "pagination.out_of": "%1 / %2", - "pagination.enter_index": "Go to post index", + "pagination.enter_index": "跳转到帖子", "header.admin": "管理", "header.categories": "版块", "header.recent": "最新", diff --git a/public/language/zh-CN/modules.json b/public/language/zh-CN/modules.json index d7684e6794..3dff397d9d 100644 --- a/public/language/zh-CN/modules.json +++ b/public/language/zh-CN/modules.json @@ -6,8 +6,8 @@ "chat.no_active": "暂无聊天", "chat.user_typing": "%1 正在输入……", "chat.user_has_messaged_you": "%1 向您发送了消息。", - "chat.see_all": "All chats", - "chat.mark_all_read": "Mark all read", + "chat.see_all": "全部对话", + "chat.mark_all_read": "标记全部已读", "chat.no-messages": "请选择接收人，以查看聊天消息历史", "chat.no-users-in-room": "此聊天室中没有用户", "chat.recent-chats": "最近聊天", diff --git a/public/language/zh-CN/notifications.json b/public/language/zh-CN/notifications.json index ebb702d8ff..cfd4b7fd3d 100644 --- a/public/language/zh-CN/notifications.json +++ b/public/language/zh-CN/notifications.json @@ -1,8 +1,8 @@ { "title": "通知", "no_notifs": "您没有新的通知", - "see_all": "All notifications", - "mark_all_read": "Mark all read", + "see_all": "全部通知", + "mark_all_read": "标记全部已读", "back_to_home": "返回 %1", "outgoing_link": "站外链接", "outgoing_link_message": "您正在离开 %1", From bfeb03680a65254eaf2f39ada1f726e4f5686b3a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Sep 2022 09:58:04 -0400 Subject: [PATCH 025/150] fix(deps): update dependency sanitize-html to v2.7.2 (#10893) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index fec6773bc1..351628fd36 100644 --- a/install/package.json +++ b/install/package.json @@ -117,7 +117,7 @@ "request-promise-native": "1.0.9", "rimraf": "3.0.2", "rss": "1.2.2", - "sanitize-html": "2.7.1", + "sanitize-html": "2.7.2", "semver": "7.3.7", "serve-favicon": "2.5.0", "sharp": "0.31.0", From 5aa55d29f3bad686c7b3e8f2cff6d03ee42c42f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Sep 2022 10:11:47 -0400 Subject: [PATCH 026/150] chore(deps): update postgres docker tag to v14 (#10829) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 225615aa72..7254f19515 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -42,7 +42,7 @@ jobs: services: postgres: - image: 'postgres:10-alpine' + image: 'postgres:14-alpine' env: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres From 3f30056a71c782dacc27a69d59aae6ece2a3f8a0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Sep 2022 11:06:32 -0400 Subject: [PATCH 027/150] chore(deps): update commitlint monorepo (#10888) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 351628fd36..dec986509d 100644 --- a/install/package.json +++ b/install/package.json @@ -146,8 +146,8 @@ }, "devDependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@commitlint/cli": "17.0.3", - "@commitlint/config-angular": "17.0.3", + "@commitlint/cli": "17.1.2", + "@commitlint/config-angular": "17.1.0", "coveralls": "3.1.1", "eslint": "8.23.1", "eslint-config-nodebb": "0.1.1", From fe249fa57761fc3779d0869effde2b05b5682503 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 16 Sep 2022 11:44:34 -0400 Subject: [PATCH 028/150] fix: listen to -d flag on cli upgrade --- src/cli/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cli/index.js b/src/cli/index.js index 5c3c01fd88..81ad5c0b37 100644 --- a/src/cli/index.js +++ b/src/cli/index.js @@ -266,6 +266,10 @@ program ].join('\n')}`); }) .action((scripts, options) => { + if (program.opts().dev) { + process.env.NODE_ENV = 'development'; + global.env = 'development'; + } require('./upgrade').upgrade(scripts.length ? scripts : true, options); }); From 425bf87b075471d88aa8d0efdc06c58a689b6193 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Sep 2022 19:18:34 +0000 Subject: [PATCH 029/150] fix(deps): update dependency nodebb-theme-persona to v12.1.2 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index dec986509d..08f2f54be5 100644 --- a/install/package.json +++ b/install/package.json @@ -98,7 +98,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.1.1", + "nodebb-theme-persona": "12.1.2", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", From 02fe6875034ab97ac4788c170f9fcf4058c3d7fa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 17 Sep 2022 01:46:17 +0000 Subject: [PATCH 030/150] fix(deps): update dependency nodebb-plugin-2factor to v5.1.1 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 08f2f54be5..ec3a82838a 100644 --- a/install/package.json +++ b/install/package.json @@ -88,7 +88,7 @@ "multiparty": "4.2.3", "@nodebb/bootswatch": "3.4.2", "nconf": "0.12.0", - "nodebb-plugin-2factor": "5.1.0", + "nodebb-plugin-2factor": "5.1.1", "nodebb-plugin-composer-default": "9.2.0", "nodebb-plugin-dbsearch": "5.1.5", "nodebb-plugin-emoji": "4.0.5", From 0debc51b8fe7a55a02f1120bbc2ba2c2b243b57f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 17 Sep 2022 01:41:53 -0400 Subject: [PATCH 031/150] fix(deps): update dependency nodebb-theme-persona to v12.1.3 (#10903) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ec3a82838a..c787d1fb43 100644 --- a/install/package.json +++ b/install/package.json @@ -98,7 +98,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.1.2", + "nodebb-theme-persona": "12.1.3", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", From 3700174c628786a4e9d828adb6c37c889451be6b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Sep 2022 15:18:46 -0400 Subject: [PATCH 032/150] refactor: added new ajaxify method .cleanup, called before ajaxify.start. --- public/src/ajaxify.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 1ae52a9cb1..d7fcac6eb5 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -44,9 +44,7 @@ ajaxify.widgets = { render: render }; quiet = true; } - app.leaveCurrentRoom(); - - $(window).off('scroll'); + ajaxify.cleanup(url, ajaxify.data.template.name); if ($('#content').hasClass('ajaxifying') && apiXHR) { apiXHR.abort(); @@ -456,6 +454,12 @@ ajaxify.widgets = { render: render }; }); }; + ajaxify.cleanup = (url, tpl_url) => { + app.leaveCurrentRoom(); + $(window).off('scroll'); + hooks.fire('action:ajaxify.cleanup', { url, tpl_url }); + }; + require(['translator', 'benchpress'], function (translator, Benchpress) { translator.translate('[[error:no-connection]]'); translator.translate('[[error:socket-reconnect-failed]]'); From 5b9de0e5215e0ea0276a11786120660963a68810 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Sep 2022 15:27:02 -0400 Subject: [PATCH 033/150] fix: be tidier and explicitly clean up ctrl-f hotkey on topic page --- public/src/client/topic.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index f9a8ca05b3..8f052bab2b 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -76,11 +76,13 @@ define('forum/topic', [ if (config.topicSearchEnabled) { require(['mousetrap', 'search'], function (mousetrap, search) { mousetrap.bind(['command+f', 'ctrl+f'], function (e) { - if (ajaxify.data.template.topic) { - e.preventDefault(); - $('#search-fields input').val('in:topic-' + ajaxify.data.tid + ' '); - search.showAndFocusInput(); - } + e.preventDefault(); + $('#search-fields input').val('in:topic-' + ajaxify.data.tid + ' '); + search.showAndFocusInput(); + }); + + hooks.onPage('action:ajaxify.cleanup', () => { + mousetrap.unbind(['command+f', 'ctrl+f']); }); }); } From bbe7f7795f75ef752eb46c3934d674adf99c1694 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 13:00:03 -0400 Subject: [PATCH 034/150] fix(deps): update dependency mongodb to v4.10.0 (#10908) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index c787d1fb43..5b2d631e6d 100644 --- a/install/package.json +++ b/install/package.json @@ -82,7 +82,7 @@ "material-design-lite": "1.3.0", "mime": "3.0.0", "mkdirp": "1.0.4", - "mongodb": "4.9.1", + "mongodb": "4.10.0", "morgan": "1.10.0", "mousetrap": "1.6.5", "multiparty": "4.2.3", From 9f9a835fcbc5310582aa46b68f001568aab8da62 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Sep 2022 11:06:16 -0400 Subject: [PATCH 035/150] feat: a couple utility methods in navigator module to get and set count and index --- public/src/modules/navigator.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 824f55434a..2dcbdb6aec 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -47,7 +47,6 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct thumb = $('.scroller-thumb'); thumbText = thumb.find('.thumb-text'); - $(window).off('scroll', navigator.delayedUpdate).on('scroll', navigator.delayedUpdate); paginationBlockEl.find('.dropdown-menu').off('click').on('click', function (e) { @@ -331,6 +330,8 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct return parts[1] + '/' + parts[2] + '/' + parts[3] + (index ? '/' + index : ''); } + navigator.getCount = () => count; + navigator.setCount = function (value) { value = parseInt(value, 10); if (value === count) { @@ -440,6 +441,13 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct toggle(!!count); }; + navigator.getIndex = () => index; + + navigator.setIndex = (newIndex) => { + index = newIndex + 1; + navigator.updateTextAndProgressBar(); + }; + navigator.updateTextAndProgressBar = function () { if (!utils.isNumber(index)) { return; From fa643eb80893e3e5d51dab8eea8f06f9c9c7e93d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Sep 2022 11:09:22 -0400 Subject: [PATCH 036/150] fix: race condition where `navigator.update` was called when it should not be --- public/src/modules/navigator.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 2dcbdb6aec..e6933999c7 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -581,9 +581,9 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct function animateScroll() { function reenableScroll() { // Re-enable onScroll behaviour - $(window).on('scroll', navigator.delayedUpdate); - const scrollToRect = scrollTo.get(0).getBoundingClientRect(); - navigator.update(scrollToRect.top); + setTimeout(() => { // fixes race condition from jQuery — onAnimateComplete called too quickly + $(window).on('scroll', navigator.delayedUpdate); + }, 50); } function onAnimateComplete() { if (done) { From b7287c1eb8aa5175ac065cf3f957579508454715 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Sep 2022 11:10:35 -0400 Subject: [PATCH 037/150] fix: do not call `navigator.update()` when `scrollToElement` is explicitly passed a new index value --- public/src/modules/navigator.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index e6933999c7..2fe68c1d2b 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -552,15 +552,15 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct navigator.scrollToPostIndex = function (postIndex, highlight, duration) { const scrollTo = components.get('post', 'index', postIndex); - navigator.scrollToElement(scrollTo, highlight, duration); + navigator.scrollToElement(scrollTo, highlight, duration, postIndex); }; navigator.scrollToTopicIndex = function (topicIndex, highlight, duration) { const scrollTo = $('[component="category/topic"][data-index="' + topicIndex + '"]'); - navigator.scrollToElement(scrollTo, highlight, duration); + navigator.scrollToElement(scrollTo, highlight, duration, topicIndex); }; - navigator.scrollToElement = function (scrollTo, highlight, duration) { + navigator.scrollToElement = function (scrollTo, highlight, duration, newIndex = null) { if (!scrollTo.length) { navigator.scrollActive = false; return; @@ -594,8 +594,13 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct navigator.scrollActive = false; highlightPost(); - $('body').scrollTop($('body').scrollTop() - 1); - $('html').scrollTop($('html').scrollTop() - 1); + + const scrollToRect = scrollTo.get(0).getBoundingClientRect(); + if (!newIndex) { + navigator.update(scrollToRect.top); + } else { + navigator.setIndex(newIndex); + } } let scrollTop = 0; From aeb94c32b939d467e8c315c14bec5c9826452009 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Sep 2022 11:11:27 -0400 Subject: [PATCH 038/150] feat: j and k hotkeys in topic to navigate through it quickly --- public/src/client/topic.js | 40 ++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 8f052bab2b..961fcd74c3 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -73,19 +73,39 @@ define('forum/topic', [ }; function handleTopicSearch() { - if (config.topicSearchEnabled) { - require(['mousetrap', 'search'], function (mousetrap, search) { - mousetrap.bind(['command+f', 'ctrl+f'], function (e) { - e.preventDefault(); - $('#search-fields input').val('in:topic-' + ajaxify.data.tid + ' '); - search.showAndFocusInput(); - }); + require(['mousetrap'], (mousetrap) => { + if (config.topicSearchEnabled) { + require(['search'], function (search) { + mousetrap.bind(['command+f', 'ctrl+f'], function (e) { + e.preventDefault(); + $('#search-fields input').val('in:topic-' + ajaxify.data.tid + ' '); + search.showAndFocusInput(); + }); - hooks.onPage('action:ajaxify.cleanup', () => { - mousetrap.unbind(['command+f', 'ctrl+f']); + hooks.onPage('action:ajaxify.cleanup', () => { + mousetrap.unbind(['command+f', 'ctrl+f']); + }); }); + } + + mousetrap.bind('j', () => { + const index = navigator.getIndex(); + const count = navigator.getCount(); + if (index === count) { + return; + } + + navigator.scrollToIndex(index, true, 0); }); - } + + mousetrap.bind('k', () => { + const index = navigator.getIndex(); + if (index === 1) { + return; + } + navigator.scrollToIndex(index - 2, true, 0); + }); + }); } Topic.toTop = function () { From 664bc5f54de79fb71ba9f4026c0be5b376231ecf Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Sep 2022 13:57:25 -0400 Subject: [PATCH 039/150] fix: update nav thumb on setIndex call (thx @barisusakli) --- public/src/modules/navigator.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 2fe68c1d2b..0b55e8ee4b 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -446,6 +446,7 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct navigator.setIndex = (newIndex) => { index = newIndex + 1; navigator.updateTextAndProgressBar(); + setThumbToIndex(index); }; navigator.updateTextAndProgressBar = function () { From 135fe55bed88eab8d6caba7495879d859f397708 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Sep 2022 14:27:35 -0400 Subject: [PATCH 040/150] feat: client-side hooks for navigator scroll action --- public/src/modules/navigator.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 0b55e8ee4b..3d3e904c7f 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -561,12 +561,14 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct navigator.scrollToElement(scrollTo, highlight, duration, topicIndex); }; - navigator.scrollToElement = function (scrollTo, highlight, duration, newIndex = null) { + navigator.scrollToElement = async (scrollTo, highlight, duration, newIndex = null) => { if (!scrollTo.length) { navigator.scrollActive = false; return; } + await hooks.fire('filter:navigator.scroll', { scrollTo, highlight, duration, newIndex }); + const postHeight = scrollTo.outerHeight(true); const navbarHeight = components.get('navbar').outerHeight(true); const topicHeaderHeight = $('.topic-header').outerHeight(true) || 0; @@ -584,6 +586,8 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct // Re-enable onScroll behaviour setTimeout(() => { // fixes race condition from jQuery — onAnimateComplete called too quickly $(window).on('scroll', navigator.delayedUpdate); + + hooks.fire('action:navigator.scrolled', { scrollTo, highlight, duration, newIndex }); }, 50); } function onAnimateComplete() { From 27c80d3945c58ce7084796f78647f39bf8553953 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Sep 2022 14:30:21 -0400 Subject: [PATCH 041/150] fix(deps): bump persona, #10907 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 5b2d631e6d..0632a8ca99 100644 --- a/install/package.json +++ b/install/package.json @@ -98,7 +98,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.1.3", + "nodebb-theme-persona": "12.1.4", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", From 846eda0af6b977b7bbd99010782286c56cc6a60d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Sep 2022 14:55:55 -0400 Subject: [PATCH 042/150] fix(deps): bump persona #10907 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 0632a8ca99..8a971950d2 100644 --- a/install/package.json +++ b/install/package.json @@ -98,7 +98,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.1.4", + "nodebb-theme-persona": "12.1.5", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", From f971385bbc5a020158443b2a3549585172d46953 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Sep 2022 13:20:15 -0400 Subject: [PATCH 043/150] fix(deps): update dependency compare-versions to v5 (#10890) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 8a971950d2..1089bdb509 100644 --- a/install/package.json +++ b/install/package.json @@ -45,7 +45,7 @@ "clipboard": "2.0.11", "colors": "1.4.0", "commander": "9.4.0", - "compare-versions": "4.1.4", + "compare-versions": "5.0.1", "compression": "1.7.4", "connect-flash": "0.1.1", "connect-mongo": "4.6.0", From 5429487110a6d22c502b0237716787d239ad2099 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Sep 2022 20:38:54 -0400 Subject: [PATCH 044/150] fix(deps): update dependency autoprefixer to v10.4.12 (#10911) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index c6a6bd716f..fb2fcb61a0 100644 --- a/install/package.json +++ b/install/package.json @@ -33,7 +33,7 @@ "ace-builds": "1.10.1", "archiver": "5.3.1", "async": "3.2.4", - "autoprefixer": "10.4.11", + "autoprefixer": "10.4.12", "bcryptjs": "2.4.3", "benchpressjs": "2.4.3", "body-parser": "1.20.0", From d900fd1718ced495f6562037456c19ad95aa653d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Sep 2022 20:39:12 -0400 Subject: [PATCH 045/150] fix(deps): update dependency ace-builds to v1.11.0 (#10909) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index fb2fcb61a0..83024982db 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.0", - "ace-builds": "1.10.1", + "ace-builds": "1.11.0", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.12", From 53d47a58f6e79c87d2aa81cf887782ee6e80c7d1 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Sep 2022 11:56:58 -0400 Subject: [PATCH 046/150] fix: use `--omit=dev` flag for npm instead of `--production` --- src/cli/package-install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/package-install.js b/src/cli/package-install.js index b3b5544bb4..eea93e5d9e 100644 --- a/src/cli/package-install.js +++ b/src/cli/package-install.js @@ -120,7 +120,7 @@ pkgInstall.installAll = () => { command = `cnpm install ${prod ? ' --production' : ''}`; break; default: - command += prod ? ' --production' : ''; + command += prod ? ' --omit=dev' : ''; break; } } From 26415ea448eb8b465ae5e05a250bc21fd2ed3bb0 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Thu, 22 Sep 2022 09:07:09 +0000 Subject: [PATCH 047/150] Latest translations and fallbacks --- public/language/he/admin/manage/users.json | 2 +- public/language/he/admin/settings/advanced.json | 6 +++--- public/language/he/admin/settings/email.json | 2 +- public/language/he/admin/settings/post.json | 2 +- public/language/he/admin/settings/reputation.json | 4 ++-- public/language/he/admin/settings/user.json | 6 +++--- public/language/he/global.json | 2 +- public/language/he/modules.json | 2 +- public/language/he/register.json | 2 +- public/language/he/user.json | 14 +++++++------- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/public/language/he/admin/manage/users.json b/public/language/he/admin/manage/users.json index 6952a385e1..f84ad38851 100644 --- a/public/language/he/admin/manage/users.json +++ b/public/language/he/admin/manage/users.json @@ -63,7 +63,7 @@ "create.password": "סיסמה", "create.password-confirm": "אשר סיסמה", - "temp-ban.length": "Length", + "temp-ban.length": "זמן הרחקה", "temp-ban.reason": "סיבה (אופציונאלי)", "temp-ban.hours": "שעות", "temp-ban.days": "ימים", diff --git a/public/language/he/admin/settings/advanced.json b/public/language/he/admin/settings/advanced.json index d506ad2d83..af2a6d2efb 100644 --- a/public/language/he/admin/settings/advanced.json +++ b/public/language/he/admin/settings/advanced.json @@ -26,10 +26,10 @@ "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "ניהול תעבורה", - "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", - "traffic.enable": "Enable Traffic Management", + "traffic.help": "NodeBB משתמש במודול שדוחה אוטומטית בקשות במצבים עם תעבורה גבוהה. אתה יכול לכוונן את ההגדרות האלה כאן, למרות שברירות המחדל הן נקודת התחלה טובה.", + "traffic.enable": "הפעל ניהול תעבורה", "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", - "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", + "traffic.event-lag-help": "הורדת ערך זה מקטינה את זמני ההמתנה לטעינת הדפים, אך גם תציג את ההודעה \"עומס מופרז\" ליותר משתמשים. (אתחול נדרש)", "traffic.lag-check-interval": "מרווח זמן בין בדיקות (במילישניות)", "traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)", diff --git a/public/language/he/admin/settings/email.json b/public/language/he/admin/settings/email.json index c2f1b3c6ef..608ad32da6 100644 --- a/public/language/he/admin/settings/email.json +++ b/public/language/he/admin/settings/email.json @@ -40,7 +40,7 @@ "notifications.remove-images": "הסר תמונות מהודעות דוא\"ל", "require-email-address": "דרוש ממשתמשים חדשים כתובת אימייל", "require-email-address-warning": "By default, users can opt-out of entering an email address by leaving the field blank. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.", - "send-validation-email": "Send validation emails when an email is added or changed", + "send-validation-email": "שלח דוא\"ל אימות כאשר נוסף או משתנה דוא\"ל", "include-unverified-emails": "שלח דוא\"ל גם למשתמשים שלא אימתו את הכתובת שלהם", "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws.", "prompt": "בקש מהמשתמשים להגדיר/לאמת את כתובת הדוא\"ל שלהם", diff --git a/public/language/he/admin/settings/post.json b/public/language/he/admin/settings/post.json index f3f938f47e..35566fd348 100644 --- a/public/language/he/admin/settings/post.json +++ b/public/language/he/admin/settings/post.json @@ -51,7 +51,7 @@ "signature.disable": "השבת חתימות", "signature.no-links": "השבת קישורים בחתימות", "signature.no-images": "השבת תמונות בחתימות", - "signature.hide-duplicates": "Hide duplicate signatures in topics", + "signature.hide-duplicates": "הצג חתימות פעם אחת בלבד בכל נושא", "signature.max-length": "אורך חתימה מרבי", "composer": "הגדרות יצירת פוסט", "composer-help": "ההגדרות הבאות חלות על הפונקציונליות ו/או המראה של יוצר הפוסט המוצג\n\t\t\t\tלמשתמשים בעת יצירת נושאים חדשים, או מענה לנושאים קיימים.", diff --git a/public/language/he/admin/settings/reputation.json b/public/language/he/admin/settings/reputation.json index a583635a09..9683ce420f 100644 --- a/public/language/he/admin/settings/reputation.json +++ b/public/language/he/admin/settings/reputation.json @@ -24,8 +24,8 @@ "flags.limit-per-target-help": "כשפוסט או משתמש מסומן כמה פעמים, כל דיווח נוסף נחשב ל "דיווח" ונוסף לדיווח הראשון. הגדר את האופציה הזאת לכל מספר שהוא לא 0 כדי להגביל את כמות הדיווחים שפוסט או משתמש יכול לקבל.", "flags.auto-flag-on-downvote-threshold": "מספר הצבעות למטה כדי ליצור דיווח אטומטי (הגדר ל-0 כדי להשבית; ברירת מחדל: 0)", "flags.auto-resolve-on-ban": "פתור אוטומטי כל כרטיסי משתמש כאשר הוא מוחרם", - "flags.action-on-resolve": "Do the following when a flag is resolved", - "flags.action-on-reject": "Do the following when a flag is rejected", + "flags.action-on-resolve": "בצע את הפעולות הבאות כאשר דיווח נפתר", + "flags.action-on-reject": "בצע את הפעולות הבאות כאשר דיווח נדחה", "flags.action.nothing": "Do nothing", "flags.action.rescind": "Rescind the notification send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/he/admin/settings/user.json b/public/language/he/admin/settings/user.json index 141edb7a99..b07b190e15 100644 --- a/public/language/he/admin/settings/user.json +++ b/public/language/he/admin/settings/user.json @@ -29,7 +29,7 @@ "session-time-days": "ימים", "session-time-seconds": "שניות", "session-time-help": "ערכים אלו משמשים כדי להגדיר כמה זמן משתמשים יישארו מחוברים כאשר הם סימנו "זכור אותי" בהתחברות. שים לב שייעשה שימוש רק באחד מהערכים האלו. אם אין ערך שניות נשתמש בערך ימים. אם אין ערך ימים הערך יחזור לברירת מחדל 14 יום.", - "online-cutoff": "דקות אחרי שהמשתמש נחשב לא פעיל", + "online-cutoff": "אחרי כמה דקות דקות המשתמש ייחשב ללא פעיל", "online-cutoff-help": "אם משתמש אינו מבצע פעולות במשך זמן זה, הוא נחשב כלא פעיל ואינו מקבל עדכונים בזמן אמת.", "registration": "רישום משתמש", "registration-type": "סוג הרשמה", @@ -40,8 +40,8 @@ "registration-type.invite-only": "הזמנה בלבד", "registration-type.admin-invite-only": "הזמנת מנהל בלבד", "registration-type.disabled": "בטל הרשמה", - "registration-type.help": "רגיל - משתמשים יכולים להירשם על ידי שימוש בדף /register.
\nהזמנה בלבד - משתמשים אחרים יכולים להזמין משתמשים מדף המשתמש.
\nהזמנת מנהל בלבד - רק מנהלים יכולים להזמין משתמשים אחרים מדף המשתמש ודף ההנהלת משתמשים.
\nבטל הרשמה - לא ניתן להירשם.
ד", - "registration-approval-type.help": "רגיל - משתמשים נרשמים באופן מיידי.
\nאישור מנהל - משתמשים אשר נרשמו מוכנים לתוך רשימת אישור למנהלים.
\nאישור מנהל לכתובות IP - רגיל למשתמשים חדשים, אישור מנהל לכתובות IP אשר כבר מקושר אליהם חשבון.
", + "registration-type.help": "רגיל - משתמשים יכולים להירשם על ידי שימוש בדף ההרשמה (/register).
\nהזמנה בלבד - משתמשים אחרים יכולים להזמין משתמשים מדף המשתמשים.
\nהזמנת מנהל בלבד - רק מנהלים יכולים להזמין משתמשים אחרים מדף המשתמשים ודף ניהול משתמשים.
\nבטל הרשמה - לא ניתן להירשם.
ד", + "registration-approval-type.help": "רגיל - משתמשים נרשמים באופן מיידי.
\nאישור מנהל - משתמשים אשר נרשמו מוכנסים לתוך רשימת אישור למנהלים.
\nאישור מנהל לכתובות IP - רגיל למשתמשים חדשים, אישור מנהל לכתובות IP אשר כבר מקושר אליהם חשבון.
", "registration-queue-auto-approve-time": "זמן אישור אוטומטי", "registration-queue-auto-approve-time-help": "שעות לפני שהמשתמש מאושר באופן אוטומטי. רשום 0 על-מנת להשבית.", "registration-queue-show-average-time": "הצג למשתמשים זמן ממוצע שנדרש על-מנת לאשר משתמש חדש", diff --git a/public/language/he/global.json b/public/language/he/global.json index 5089e30de6..e9f3feca1a 100644 --- a/public/language/he/global.json +++ b/public/language/he/global.json @@ -23,7 +23,7 @@ "close": "סגור", "pagination": "הגדרות עמוד", "pagination.out_of": "%1 מתוך %2", - "pagination.enter_index": "Go to post index", + "pagination.enter_index": "עבור למיקום פוסט", "header.admin": "ניהול", "header.categories": "קטגוריות", "header.recent": "פוסטים אחרונים", diff --git a/public/language/he/modules.json b/public/language/he/modules.json index bed09d654c..fefaec201a 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -3,7 +3,7 @@ "chat.placeholder": "כתבו תוכן הודעת הצ'אט כאן, ניתן לגרור ולשחרר כאן תמונות, הקישו אנטר לשליחה.", "chat.scroll-up-alert": "הנכם צופים כעת בהודעות ישנות. לחצו כאן למעבר להודעה האחרונה.", "chat.send": "שליחה", - "chat.no_active": "אין לכם צ'אטים פעילים", + "chat.no_active": "אין לכם צ'אטים פעילים.", "chat.user_typing": "%1 מקליד...", "chat.user_has_messaged_you": "ל%1 יש הודעה עבורכם.", "chat.see_all": "צפו בכל הצ'אטים", diff --git a/public/language/he/register.json b/public/language/he/register.json index 177e9e543f..c1ee9e3bf3 100644 --- a/public/language/he/register.json +++ b/public/language/he/register.json @@ -1,5 +1,5 @@ { - "register": "הרשם", + "register": "הרשמה", "cancel_registration": "בטל רישום", "help.email": "כברירת מחדל, כתובת האימייל שלך לא גלויה למשתמשים אחרים", "help.username_restrictions": "שם משתמש ייחודי בין %1 ל %2 תווים. משתמשים אחרים יכולים לציין את שמך באמצעות @שם המשתמש שלך.", diff --git a/public/language/he/user.json b/public/language/he/user.json index 285b3b7c28..da8bb59231 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -76,7 +76,7 @@ "change_password_success": "הסיסמה שלך עודכנה!", "confirm_password": "אימות סיסמה", "password": "סיסמה", - "username_taken_workaround": "שם המשתמש שבחרת כבר תפוס, ולכן שינינו אותו מעט. שם המשתמש שלך כעת הוא %1", + "username_taken_workaround": "שם המשתמש שבחרת כבר תפוס, ולכן שינינו אותו מעט. שם המשתמש שלך כעת הוא: %1", "password_same_as_username": "הסיסמה שלך זהה לשם המשתמש, בחר סיסמה שונה.", "password_same_as_email": "הסיסמה שלך זהה לכתובת המייל שלך, בחר סיסמה שונה.", "weak_password": "סיסמה חלשה.", @@ -84,7 +84,7 @@ "upload_a_picture": "העלה תמונה", "remove_uploaded_picture": "מחק את התמונה שהועלתה", "upload_cover_picture": "העלה תמונת נושא", - "remove_cover_picture_confirm": "האם אתה בטוח שאתה רוצה למחוק תמונת נושא?", + "remove_cover_picture_confirm": "האם אתה בטוח שאתה רוצה למחוק את תמונת נושא?", "crop_picture": "חתוך תמונה", "upload_cropped_picture": "חתוך והעלה", "avatar-background-colour": "צבע רקע של תמונת נושא", @@ -100,9 +100,9 @@ "digest_biweekly": "דו שבועי", "digest_monthly": "חודשי", "has_no_follower": "למשתמש זה אין עוקבים :(", - "follows_no_one": "משתמש זה אינו עוקב אחרי אחרים :(", - "has_no_posts": "המשתמש טרם יצר פוסטים כלשהם.", - "has_no_best_posts": "למשתמש זה אין עדיין פוסטים נבחרים.", + "follows_no_one": "משתמש זה אינו עוקב אחרי אחרים", + "has_no_posts": "משתמש זה טרם יצר פוסטים כלשהם.", + "has_no_best_posts": "למשתמש זה אין עדיין פוסטים עם הצבעה בעד.", "has_no_topics": "המשתמש טרם יצר נושאים כלשהם.", "has_no_watched_topics": "המשתמש טרם צפה בנושאים כלשהם.", "has_no_ignored_topics": "המשתמש הזה טרם התעלם מנושאים.", @@ -182,10 +182,10 @@ "consent.right_to_rectification": "זכותך לתקן טעויות", "consent.right_to_rectification_description": "יש לך זכות לשנות או לעדכן נתונים שנאספו. ניתן לעדכן את הפרופיל שלך וכן לערוך כל תוכן שפורסם. במידת הצורך, אנא צור קשר עם צוות ניהול האתר.", "consent.right_to_erasure": "זכותך למחוק את חשבונך", - "consent.right_to_erasure_description": "בכל עת תוכל לבטל את הסכמתך לאיסוף נתונים ו / או עיבודם על ידי מחיקת חשבונך. מחיקת הפרופיל שלך לא תגרום למחיקת התוכנים שפרסמת. על מנת למחוק את חשבונך ואת התוכן המקושר לו צור קשר עם צוות הניהול של האתר.", + "consent.right_to_erasure_description": "בכל עת תוכל לבטל את הסכמתך לאיסוף נתונים ו/או עיבודם על ידי מחיקת חשבונך. מחיקת הפרופיל שלך לא תגרום למחיקת התוכנים שפרסמת. על מנת למחוק את חשבונך ואת התוכן המקושר לו צור קשר עם צוות הניהול של האתר.", "consent.right_to_data_portability": "זכותך לניוד הנתונים", "consent.right_to_data_portability_description": "באפרותך לבקש ייצוא של כל הנתונים שנאספו מחשבונך אודותיך. תוכל לעשות זאת על ידי לחיצה על הלחצן המתאים מטה.", - "consent.export_profile": "יצוא פרופיל (.json)", + "consent.export_profile": "יצוא פרופיל (json.)", "consent.export-profile-success": "ייצוא הפרופיל מתבצע כעת. תקבל התראה כאשר הייצוא יסתיים.", "consent.export_uploads": "יצוא תוכן שהועלה (ZIP.)", "consent.export-uploads-success": "ייצוא ההעלאות מתבצע כעת. תקבל התראה כאשר הייצוא יסתיים.", From ce77605a83ea8a09dfca4d309c01bca545646a17 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 08:46:20 -0400 Subject: [PATCH 048/150] fix(deps): update dependency ace-builds to v1.11.1 (#10920) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 83024982db..4b856e3381 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.0", - "ace-builds": "1.11.0", + "ace-builds": "1.11.1", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.12", From a584dae65027bd9f0c42c645e438142a2a6c6456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 23 Sep 2022 10:42:15 -0400 Subject: [PATCH 049/150] feat: add relevant topic events to post objects see https://github.com/NodeBB/nodebb-theme-persona/commit/c9604f216a87ae867a7c31e10abbb43f30e2f19a --- public/src/modules/helpers.common.js | 1 + src/topics/index.js | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js index 25907fb446..04ab16c3f8 100644 --- a/public/src/modules/helpers.common.js +++ b/public/src/modules/helpers.common.js @@ -181,6 +181,7 @@ module.exports = function (utils, Benchpress, relative_path) { } function renderTopicEvents(index, sort) { + console.warn('[renderTopicEvents] deprecated, use a partial at partials/topic/event.tpl'); if (sort === 'most_votes') { return ''; } diff --git a/src/topics/index.js b/src/topics/index.js index 94f9803f5c..b6dd08e817 100644 --- a/src/topics/index.js +++ b/src/topics/index.js @@ -185,6 +185,12 @@ Topics.getTopicWithPosts = async function (topicData, set, uid, start, stop, rev topicData.thumbs = thumbs[0]; topicData.posts = posts; topicData.events = events; + topicData.posts.forEach((p) => { + p.events = events.filter( + event => event.timestamp >= p.eventStart && event.timestamp < p.eventEnd + ); + }); + topicData.category = category; topicData.tagWhitelist = tagWhitelist[0]; topicData.minTags = category.minTags; From 09c24e1f033d1fc1e0c864726d52d1fafb60a898 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 28 Sep 2022 09:07:25 +0000 Subject: [PATCH 050/150] Latest translations and fallbacks --- public/language/zh-CN/post-queue.json | 12 ++++++------ public/language/zh-CN/register.json | 2 +- public/language/zh-CN/user.json | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/public/language/zh-CN/post-queue.json b/public/language/zh-CN/post-queue.json index 61a6d2541e..bfcebbcd04 100644 --- a/public/language/zh-CN/post-queue.json +++ b/public/language/zh-CN/post-queue.json @@ -18,14 +18,14 @@ "remove": "移除", "notify": "Notify", "notify-user": "Notify User", - "confirm-reject": "Do you want to reject this post?", - "bulk-actions": "Bulk Actions", + "confirm-reject": "你想要拒绝这个帖子吗？", + "bulk-actions": "批量操作", "accept-all": "全部同意", "accept-selected": "同意选中项", "reject-all": "全部拒绝", - "reject-all-confirm": "Do you want to reject all posts?", + "reject-all-confirm": "你想要拒绝所有帖子吗？", "reject-selected": "拒绝选中项", - "reject-selected-confirm": "Do you want to reject %1 selected posts?", - "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "reject-selected-confirm": "您确定要拒绝%1个选择的帖子吗？", + "bulk-accept-success": "%1个帖子已接受", + "bulk-reject-success": "%1个帖子已拒绝" } \ No newline at end of file diff --git a/public/language/zh-CN/register.json b/public/language/zh-CN/register.json index 867f6adf70..e24060429c 100644 --- a/public/language/zh-CN/register.json +++ b/public/language/zh-CN/register.json @@ -21,7 +21,7 @@ "registration-queue-average-time": "我们通常的注册批准时间为 %1 小时 %2 分钟。", "registration-queue-auto-approve-time": "您在此论坛的帐号将会在最迟 %1  小时后被完全激活。", "interstitial.intro": "我们需要一些额外信息以更新您的账号。", - "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.intro-new": "我们需要一些额外信息以创建您的账号。", "interstitial.errors-found": "请检查输入的信息：", "gdpr_agree_data": "我同意此网站对我个人信息的收集与处理。", "gdpr_agree_email": "我同意此网站向我发送摘要和通知邮件。", diff --git a/public/language/zh-CN/user.json b/public/language/zh-CN/user.json index 5f94062335..904ac4a7c4 100644 --- a/public/language/zh-CN/user.json +++ b/public/language/zh-CN/user.json @@ -1,6 +1,6 @@ { "banned": "已封禁", - "muted": "Muted", + "muted": "禁言", "offline": "离线", "deleted": "已删除", "username": "用户名", @@ -44,8 +44,8 @@ "following": "关注", "blocks": "屏蔽", "block_toggle": "屏蔽该用户", - "block_user": "封禁用户", - "unblock_user": "解封用户", + "block_user": "屏蔽用户", + "unblock_user": "解除屏蔽用户", "aboutme": "关于我", "signature": "签名档", "birthday": "生日", @@ -108,7 +108,7 @@ "has_no_ignored_topics": "此用户尚未忽略任何主题。", "has_no_upvoted_posts": "此用户还未顶过任何帖子。", "has_no_downvoted_posts": "此用户还未踩过任何帖子。", - "has_no_controversial_posts": "This user does not have any downvoted posts yet.", + "has_no_controversial_posts": "此用户没有任何踩过的帖子。", "has_no_blocks": "您没有屏蔽其他用户。", "email_hidden": "电子邮箱已隐藏", "hidden": "隐藏", @@ -157,9 +157,9 @@ "info.banned-permanently": "永久封禁", "info.banned-reason-label": "原因", "info.banned-no-reason": "没有原因", - "info.mute-history": "Recent Mute History", - "info.no-mute-history": "This user has never been muted", - "info.muted-until": "Muted until %1", + "info.mute-history": "最近禁言历史", + "info.no-mute-history": "该用户从未被禁言", + "info.muted-until": "禁言到 %1", "info.muted-expiry": "Expiry", "info.muted-no-reason": "没有原因", "info.username-history": "历史用户名", From 8e23e4107780d2bd08f32ded9733f344806c874d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 09:11:16 -0400 Subject: [PATCH 051/150] fix(deps): update dependency sharp to v0.31.1 (#10926) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 4b856e3381..bdc699ee77 100644 --- a/install/package.json +++ b/install/package.json @@ -120,7 +120,7 @@ "sanitize-html": "2.7.2", "semver": "7.3.7", "serve-favicon": "2.5.0", - "sharp": "0.31.0", + "sharp": "0.31.1", "sitemap": "7.1.1", "slideout": "1.0.1", "socket.io": "4.5.2", From 87c84fe8e01b2bca29ef0d2c2bac8d9cd1b6032d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 09:11:51 -0400 Subject: [PATCH 052/150] fix(deps): update dependency ace-builds to v1.11.2 (#10923) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index bdc699ee77..ad30216ea5 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.0", - "ace-builds": "1.11.1", + "ace-builds": "1.11.2", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.12", From 28d1844e7ee3a15522d04c82745fbec89e7fb61a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 09:25:52 -0400 Subject: [PATCH 053/150] fix(deps): update dependency nodebb-plugin-spam-be-gone to v1.0.1 (#10912) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ad30216ea5..680240a932 100644 --- a/install/package.json +++ b/install/package.json @@ -95,7 +95,7 @@ "nodebb-plugin-emoji-android": "3.0.0", "nodebb-plugin-markdown": "10.1.0", "nodebb-plugin-mentions": "3.0.11", - "nodebb-plugin-spam-be-gone": "1.0.0", + "nodebb-plugin-spam-be-gone": "1.0.1", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", "nodebb-theme-persona": "12.1.5", From c0b1ded363b9b6c76849e888297f9eab4be87af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 1 Oct 2022 22:02:01 -0400 Subject: [PATCH 054/150] fix more categories button not moving with parent fix order issue --- public/src/admin/manage/categories.js | 8 ++++++-- .../admin/partials/categories/category-rows.tpl | 13 +++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index cae9f782ca..0c541a1438 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -202,7 +202,7 @@ define('admin/manage/categories', [ // this makes sure order is correct when drag & drop is used on pages > 1 const baseIndex = (ajaxify.data.pagination.currentPage - 1) * ajaxify.data.categoriesPerPage; modified[cid] = { - order: baseIndex + e.newIndex + 1, + order: baseIndex + e.newIndex, }; if (isCategoryUpdate) { @@ -263,7 +263,11 @@ define('admin/manage/categories', [ categories: categories, parentCategory: parentCategory, }, function (html) { - container.append(html); + if (container.find('.category-row').length) { + container.find('.category-row').after(html); + } else { + container.append(html); + } // Disable expand toggle if (!categories.length) { diff --git a/src/views/admin/partials/categories/category-rows.tpl b/src/views/admin/partials/categories/category-rows.tpl index 7df4bd7c45..6c36ff81d9 100644 --- a/src/views/admin/partials/categories/category-rows.tpl +++ b/src/views/admin/partials/categories/category-rows.tpl @@ -49,11 +49,12 @@ + + - {{{ if ../hasMoreSubCategories}}} -
  • - [[category:x-more-categories, {../subCategoriesLeft}]] -
    • - {{{ end }}} - +{{{ end }}} From 8f2a78584a26539d9ef91a4757d85652c25bd28b Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sun, 2 Oct 2022 09:08:35 +0000 Subject: [PATCH 055/150] Latest translations and fallbacks --- public/language/he/admin/settings/advanced.json | 12 ++++++------ public/language/he/admin/settings/email.json | 6 +++--- public/language/he/admin/settings/post.json | 2 +- public/language/he/admin/settings/uploads.json | 2 +- public/language/he/unread.json | 2 +- public/language/he/user.json | 4 ++-- public/language/sr/notifications.json | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/public/language/he/admin/settings/advanced.json b/public/language/he/admin/settings/advanced.json index af2a6d2efb..720a9a97e1 100644 --- a/public/language/he/admin/settings/advanced.json +++ b/public/language/he/admin/settings/advanced.json @@ -20,9 +20,9 @@ "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", "hsts": "Strict Transport Security", - "hsts.enabled": "Enabled HSTS (recommended)", - "hsts.maxAge": "HSTS Max Age", - "hsts.subdomains": "Include subdomains in HSTS header", + "hsts.enabled": "הפעל HSTS (מומלץ)", + "hsts.maxAge": "גיל כותרת HSTS", + "hsts.subdomains": "כלול תת-דומיינים בכותרת HSTS", "hsts.preload": "Allow preloading of HSTS header", "hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. More information ", "traffic-management": "ניהול תעבורה", @@ -38,10 +38,10 @@ "sockets.default-placeholder": "ברירת מחדל: %1", "sockets.delay": "זמן השעייה בן נסיונות חיבור מחדש", - "analytics.settings": "Analytics Settings", - "analytics.max-cache": "Analytics Cache Max Value", + "analytics.settings": "הגדרות אנליטיקס", + "analytics.max-cache": "גודל מקסימלי של מטמון Analytics", "analytics.max-cache-help": "On high-traffic installs, the cache could be exhausted continuously if there are more concurrent active users than the Max Cache value. (Restart required)", "compression.settings": "הגדרות דחיסה", "compression.enable": "אפשר דחיסה", - "compression.help": "This setting enables gzip compression. For a high-traffic website in production, the best way to put compression in place is to implement it at a reverse proxy level. You can enable it here for testing purposes." + "compression.help": "הגדרה זו מפעילה דחיסת gzip. עבור אתר אינטרנט מרובה תנועה בייצור, הדרך הטובה ביותר להפעיל דחיסה היא ליישם אותו ברמת פרוקסי הפוך. אתה יכול להפעיל אותו כאן למטרות בדיקה." } \ No newline at end of file diff --git a/public/language/he/admin/settings/email.json b/public/language/he/admin/settings/email.json index 608ad32da6..ff9dd91896 100644 --- a/public/language/he/admin/settings/email.json +++ b/public/language/he/admin/settings/email.json @@ -13,7 +13,7 @@ "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select "Custom Service" and enter the details below.", "smtp-transport.gmail-warning1": "If you are using GMail as your email provider, you will have to generate an "App Password" in order for NodeBB to authenticate successfully. You can generate one at the App Passwords page.", "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "smtp-transport.auto-enable-toast": "It looks like you're configuring an SMTP transport. We enabled the \"SMTP Transport\" option for you.", + "smtp-transport.auto-enable-toast": "נראה שאתה מגדיר חיבור SMTP. הפעלנו עבורך את אפשרות \"תעבורת SMTP\".", "smtp-transport.host": "SMTP Host", "smtp-transport.port": "SMTP Port", "smtp-transport.security": "Connection security", @@ -39,10 +39,10 @@ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
    The approximate server time is:
    The next daily digest is scheduled to be sent ", "notifications.remove-images": "הסר תמונות מהודעות דוא\"ל", "require-email-address": "דרוש ממשתמשים חדשים כתובת אימייל", - "require-email-address-warning": "By default, users can opt-out of entering an email address by leaving the field blank. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.", + "require-email-address-warning": "כברירת מחדל, משתמשים יכולים לבטל את הסכמתם להזנת כתובת דוא\"ל על ידי השארת השדה ריק. הפעלת אפשרות זו פירושה שהם צריכים להזין כתובת דואר אלקטרוני כדי להמשיך ברישום. זה לא מבטיח שהמשתמש יזין כתובת אימייל אמיתית, ואפילו לא כתובת שבבעלותו.", "send-validation-email": "שלח דוא\"ל אימות כאשר נוסף או משתנה דוא\"ל", "include-unverified-emails": "שלח דוא\"ל גם למשתמשים שלא אימתו את הכתובת שלהם", - "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws.", + "include-unverified-warning": "כברירת מחדל, משתמשים עם אימיילים המשויכים לחשבון שלהם כבר אומתו, אך ישנם מצבים שבהם זה לא המקרה (למשל כניסות SSO, או משתמשים קיימים וכו'). הפעל הגדרה זו על אחריותך בלבד - שליחת אימיילים לכתובות לא מאומתות עשויה להיות הפרה של חוקי אנטי-ספאם אזוריים.", "prompt": "בקש מהמשתמשים להגדיר/לאמת את כתובת הדוא\"ל שלהם", "prompt-help": "הצג אזהרה למשתמשים שהדוא\"ל שלהם לא מוגדר/לא מאומת", "sendEmailToBanned": "שלח אימיילים גם למשתמשים מורחקים" diff --git a/public/language/he/admin/settings/post.json b/public/language/he/admin/settings/post.json index 35566fd348..5b39f4250c 100644 --- a/public/language/he/admin/settings/post.json +++ b/public/language/he/admin/settings/post.json @@ -45,7 +45,7 @@ "unread.cutoff": "ימי ניתוק שלא נקראו", "unread.min-track-last": "פוסטים מינימליים בנושא לפני מעקב אחר קריאה אחרונה", "recent": "הגדרות פוסטים אחרונים", - "recent.max-topics": "מקסימום נושאים ב פוסטים אחרונים", + "recent.max-topics": "מקסימום נושאים בעמוד פוסטים אחרונים", "recent.categoryFilter.disable": "הפיכת סינון נושאים ללא זמין בקטגוריות שהתעלמו מהן בדף פוסטים אחרונים", "signature": "הגדרות חתימה", "signature.disable": "השבת חתימות", diff --git a/public/language/he/admin/settings/uploads.json b/public/language/he/admin/settings/uploads.json index e850a57c65..96d398a357 100644 --- a/public/language/he/admin/settings/uploads.json +++ b/public/language/he/admin/settings/uploads.json @@ -5,7 +5,7 @@ "strip-exif-data": "הפשט נתוני EXIF", "preserve-orphaned-uploads": "שמור את הקבצים שהועלו בדיסק גם לאחר מחיקת הפוסט", "orphanExpiryDays": "מספר ימים לשמירת קבצים יתומים", - "orphanExpiryDays-help": "After this many days, orphaned uploads will be deleted from the file system.
    Set 0 or leave blank to disable.", + "orphanExpiryDays-help": "לאחר מספר ימים אלה, העלאות מיותמות יימחקו ממערכת הקבצים.
    הגדר ל-0 או השאר ריק כדי להשבית.", "private-extensions": "סיומות קובצים להפוך לפרטיים", "private-uploads-extensions-help": "הכנס כאן רשימה של פורמטי הקבצים, מופרדים בפסיק, כדי להפוך אותם לפרטיים (לדוגמא pdf,xls,doc). שורה ריקה פירושו שכל הקבצים פרטיים.", "resize-image-width-threshold": "שנה גודל תמונות אם הם רחבים יותר מהרוחב המוגדר", diff --git a/public/language/he/unread.json b/public/language/he/unread.json index b89887ee85..4735920e80 100644 --- a/public/language/he/unread.json +++ b/public/language/he/unread.json @@ -6,7 +6,7 @@ "selected": "נבחר", "all": "הכל", "all_categories": "כל הקטגוריות", - "topics_marked_as_read.success": "נושאים שמסומנים כנקרא!", + "topics_marked_as_read.success": "הנושאים שבחרת סומנו כנקרא!", "all-topics": "כל הנושאים", "new-topics": "נושאים חדשים", "watched-topics": "נושאים שאתה עוקב אחריהם", diff --git a/public/language/he/user.json b/public/language/he/user.json index da8bb59231..738821cd16 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -160,7 +160,7 @@ "info.mute-history": "הסטוריית השתקות", "info.no-mute-history": "משתמש זה מעולם לא הושתק", "info.muted-until": "מושתק עד %1", - "info.muted-expiry": "Expiry", + "info.muted-expiry": "תפוגה", "info.muted-no-reason": "לא סופקה סיבה.", "info.username-history": "היסטוריית שם משתמש", "info.email-history": "היסטוריית אימייל", @@ -195,5 +195,5 @@ "emailUpdate.optional": "שדה זה הוא אופציונלי. אינך מחויב לספק את כתובת הדוא\"ל שלך, אך ללא דוא\"ל מאומת לא תוכל לשחזר את חשבונך או להתחבר באמצעות הדוא\"ל שלך.", "emailUpdate.required": "זהו שדה חובה", "emailUpdate.change-instructions": "מייל אימות יישלח לכתובת דוא\"ל שהכנסת עם קישור ייחודי. לחיצה על הקישור יאמת את בעלותך על הדוא\"ל ותקבל גישה לחשבונך. בכל זמן, תוכל לעדכן את כתובת הדוא\"ל שלך בדף החשבון שלך.", - "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership." + "emailUpdate.password-challenge": "אנא הזן את הסיסמה שלך כדי לאמת את הבעלות על החשבון." } \ No newline at end of file diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json index 51f985cce3..fe330c996b 100644 --- a/public/language/sr/notifications.json +++ b/public/language/sr/notifications.json @@ -24,8 +24,8 @@ "upvoted_your_post_in": "%1 је гласао за вашу поруку у %2", "upvoted_your_post_in_dual": "%1 и %2 осталих су гласали за вашу поруку у %3.", "upvoted_your_post_in_multiple": "%1 и %2 осталих су гласали за вашу поруку у %3.", - "moved_your_post": "%1 је померио вашу поруку у %2", - "moved_your_topic": "%1 је померио %2", + "moved_your_post": "%1 је преместио вашу поруку у %2", + "moved_your_topic": "%1 је преместио %2", "user_flagged_post_in": "%1 је означио заставицом поруку у %2", "user_flagged_post_in_dual": "%1 и %2 су означили заставицом поруку у %3", "user_flagged_post_in_multiple": "%1 и осталих %2 су означили заставицом поруку у %3", From 61d32bdebb9a92f5984354b83b88d7bf3a0f6bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 3 Oct 2022 09:40:54 -0400 Subject: [PATCH 056/150] fix: category ordering add test --- public/src/admin/manage/categories.js | 2 +- src/categories/update.js | 2 +- test/categories.js | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 0c541a1438..adb212905e 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -202,7 +202,7 @@ define('admin/manage/categories', [ // this makes sure order is correct when drag & drop is used on pages > 1 const baseIndex = (ajaxify.data.pagination.currentPage - 1) * ajaxify.data.categoriesPerPage; modified[cid] = { - order: baseIndex + e.newIndex, + order: baseIndex + e.newIndex + 1, }; if (isCategoryUpdate) { diff --git a/src/categories/update.js b/src/categories/update.js index 20b14361fb..d4be83edb8 100644 --- a/src/categories/update.js +++ b/src/categories/update.js @@ -108,7 +108,7 @@ module.exports = function (Categories) { if (currentIndex === -1) { throw new Error('[[error:no-category]]'); } - // moves cid to index order-1 in the array + // moves cid to index order - 1 in the array if (childrenCids.length > 1) { childrenCids.splice(Math.max(0, order - 1), 0, childrenCids.splice(currentIndex, 1)[0]); } diff --git a/test/categories.js b/test/categories.js index 98d15c28bc..cd28ee33ef 100644 --- a/test/categories.js +++ b/test/categories.js @@ -421,6 +421,22 @@ describe('Categories', () => { assert.equal(data.icon, updateData[cid].icon); }); + it('should properly order categories', async () => { + const p1 = await Categories.create({ name: 'p1', description: 'd', parentCid: 0, order: 1 }); + const c1 = await Categories.create({ name: 'c1', description: 'd1', parentCid: p1.cid, order: 1 }); + const c2 = await Categories.create({ name: 'c2', description: 'd2', parentCid: p1.cid, order: 2 }); + const c3 = await Categories.create({ name: 'c3', description: 'd3', parentCid: p1.cid, order: 3 }); + // move c1 to second place + await apiCategories.update({ uid: adminUid }, { [c1.cid]: { order: 2 } }); + let cids = await db.getSortedSetRange(`cid:${p1.cid}:children`, 0, -1); + assert.deepStrictEqual(cids.map(Number), [c2.cid, c1.cid, c3.cid]); + + // move c3 to front + await apiCategories.update({ uid: adminUid }, { [c3.cid]: { order: 1 } }); + cids = await db.getSortedSetRange(`cid:${p1.cid}:children`, 0, -1); + assert.deepStrictEqual(cids.map(Number), [c3.cid, c2.cid, c1.cid]); + }); + it('should not remove category from parent if parent is set again to same category', async () => { const parentCat = await Categories.create({ name: 'parent', description: 'poor parent' }); const updateData = {}; From 7c3c3d020b08586ae4b19b8a417fe81deb3895f9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 12:41:21 -0400 Subject: [PATCH 057/150] fix(deps): update dependency yargs to v17.6.0 (#10931) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 680240a932..6e565b835e 100644 --- a/install/package.json +++ b/install/package.json @@ -141,7 +141,7 @@ "winston": "3.8.2", "xml": "1.0.1", "xregexp": "5.1.1", - "yargs": "17.5.1", + "yargs": "17.6.0", "zxcvbn": "4.4.2" }, "devDependencies": { From 8bcbff33bf709f1f489a39f811219db1a6ad8b65 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 12:41:42 -0400 Subject: [PATCH 058/150] chore(deps): update dependency eslint to v8.24.0 (#10922) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 6e565b835e..a91d09f48e 100644 --- a/install/package.json +++ b/install/package.json @@ -149,7 +149,7 @@ "@commitlint/cli": "17.1.2", "@commitlint/config-angular": "17.1.0", "coveralls": "3.1.1", - "eslint": "8.23.1", + "eslint": "8.24.0", "eslint-config-nodebb": "0.1.1", "eslint-plugin-import": "2.26.0", "grunt": "1.5.3", From 222ab6aebd3d572a485937b62d085301942048ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 12:41:57 -0400 Subject: [PATCH 059/150] fix(deps): update dependency nodemailer to v6.8.0 (#10925) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index a91d09f48e..47b99469a1 100644 --- a/install/package.json +++ b/install/package.json @@ -102,7 +102,7 @@ "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", - "nodemailer": "6.7.8", + "nodemailer": "6.8.0", "nprogress": "0.2.0", "passport": "0.6.0", "passport-http-bearer": "1.0.1", From d84ee30809ec4aa9e0928521d7694080fcca1f6b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 12:42:11 -0400 Subject: [PATCH 060/150] fix(deps): update dependency postcss to v8.4.17 (#10929) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 47b99469a1..ccd5a872e1 100644 --- a/install/package.json +++ b/install/package.json @@ -109,7 +109,7 @@ "passport-local": "1.0.0", "pg": "8.8.0", "pg-cursor": "2.7.4", - "postcss": "8.4.16", + "postcss": "8.4.17", "postcss-clean": "1.2.0", "prompt": "1.3.0", "ioredis": "5.2.3", From 855a2bad9acb3e8d4faa3e5ddb2d84cb46773a31 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 12:43:42 -0400 Subject: [PATCH 061/150] fix(deps): update dependency commander to v9.4.1 (#10928) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ccd5a872e1..c213dc3440 100644 --- a/install/package.json +++ b/install/package.json @@ -44,7 +44,7 @@ "cli-graph": "3.2.2", "clipboard": "2.0.11", "colors": "1.4.0", - "commander": "9.4.0", + "commander": "9.4.1", "compare-versions": "5.0.1", "compression": "1.7.4", "connect-flash": "0.1.1", From 1e4846435a8e8234affe6f0c8353ca72edf5b58f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 3 Oct 2022 15:36:03 -0400 Subject: [PATCH 062/150] fix: mixing of old and new bch syntax --- src/views/admin/partials/categories/category-rows.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/partials/categories/category-rows.tpl b/src/views/admin/partials/categories/category-rows.tpl index 6c36ff81d9..7c4429766e 100644 --- a/src/views/admin/partials/categories/category-rows.tpl +++ b/src/views/admin/partials/categories/category-rows.tpl @@ -1,5 +1,5 @@
      - +{{{ each categories }}}
    • class="disabled">
      From 241b7c4f30adae2fe6ad0649d05f23e4809d1258 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 16:11:30 -0400 Subject: [PATCH 063/150] chore(deps): update dependency jsdom to v20.0.1 (#10934) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index c213dc3440..cf38dca27c 100644 --- a/install/package.json +++ b/install/package.json @@ -155,7 +155,7 @@ "grunt": "1.5.3", "grunt-contrib-watch": "1.1.0", "husky": "8.0.1", - "jsdom": "20.0.0", + "jsdom": "20.0.1", "lint-staged": "13.0.3", "mocha": "10.0.0", "mocha-lcov-reporter": "1.3.0", From 1873b52746258339d3931cd81b4dd04ff7a728ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 20:12:37 +0000 Subject: [PATCH 064/150] fix(deps): update dependency nodebb-theme-persona to v12.1.7 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index cf38dca27c..96b3f318d4 100644 --- a/install/package.json +++ b/install/package.json @@ -98,7 +98,7 @@ "nodebb-plugin-spam-be-gone": "1.0.1", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", - "nodebb-theme-persona": "12.1.5", + "nodebb-theme-persona": "12.1.7", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", From 1b89b6615c39e0b3eb94f90b4221d44bb40a1225 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 5 Oct 2022 10:31:51 -0400 Subject: [PATCH 065/150] fix(deps): update dependency semver to v7.3.8 (#10937) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 96b3f318d4..b00e04bb49 100644 --- a/install/package.json +++ b/install/package.json @@ -118,7 +118,7 @@ "rimraf": "3.0.2", "rss": "1.2.2", "sanitize-html": "2.7.2", - "semver": "7.3.7", + "semver": "7.3.8", "serve-favicon": "2.5.0", "sharp": "0.31.1", "sitemap": "7.1.1", From 02ef3e974c72ae1aa8a934960d10beec98cc84e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 6 Oct 2022 07:51:13 -0400 Subject: [PATCH 066/150] Esbuild (#10940) * ci: add minimum GitHub token permissions for workflows Signed-off-by: Ashish Kurmi * feat: use esbuild for minification Co-authored-by: Ashish Kurmi --- .github/workflows/docker.yml | 3 +++ .github/workflows/test.yaml | 8 ++++++++ install/package.json | 2 ++ webpack.prod.js | 11 +++++++++++ 4 files changed, 24 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 01ca27e133..a901a4ee46 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,6 +11,9 @@ on: workflow_dispatch: # A workflow run is made up of one or more jobs that can run sequentially or in parallel +permissions: + contents: read + jobs: release: runs-on: ubuntu-latest diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7254f19515..c291c6565e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,8 +14,14 @@ defaults: run: shell: bash +permissions: + contents: read + jobs: test: + permissions: + checks: write # for coverallsapp/github-action to create new checks + contents: read # for actions/checkout to fetch code name: Lint and test strategy: fail-fast: false @@ -194,6 +200,8 @@ jobs: parallel: true finish: + permissions: + checks: write # for coverallsapp/github-action to create new checks needs: test runs-on: ubuntu-latest steps: diff --git a/install/package.json b/install/package.json index b00e04bb49..a37a4e2756 100644 --- a/install/package.json +++ b/install/package.json @@ -58,6 +58,7 @@ "csurf": "1.11.0", "daemon": "1.1.0", "diff": "5.1.0", + "esbuild": "0.15.10", "express": "4.18.1", "express-session": "1.17.3", "express-useragent": "1.0.15", @@ -129,6 +130,7 @@ "sortablejs": "1.15.0", "spdx-license-list": "6.6.0", "spider-detector": "2.0.0", + "terser-webpack-plugin": "5.3.6", "textcomplete": "0.18.2", "textcomplete.contenteditable": "0.1.1", "timeago": "1.6.7", diff --git a/webpack.prod.js b/webpack.prod.js index 523e011f3d..4cecee7d9c 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -1,8 +1,19 @@ 'use strict'; const { merge } = require('webpack-merge'); +const TerserPlugin = require('terser-webpack-plugin'); + const common = require('./webpack.common'); module.exports = merge(common, { mode: 'production', + optimization: { + minimize: true, + minimizer: [ + new TerserPlugin({ + minify: TerserPlugin.esbuildMinify, + terserOptions: {}, + }), + ], + }, }); From 3719233a43c6630dfd7ee9def812c5b9505996f1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 8 Oct 2022 01:53:13 +0000 Subject: [PATCH 067/150] chore(deps): update dependency eslint to v8.25.0 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index a37a4e2756..4702cc9e83 100644 --- a/install/package.json +++ b/install/package.json @@ -151,7 +151,7 @@ "@commitlint/cli": "17.1.2", "@commitlint/config-angular": "17.1.0", "coveralls": "3.1.1", - "eslint": "8.24.0", + "eslint": "8.25.0", "eslint-config-nodebb": "0.1.1", "eslint-plugin-import": "2.26.0", "grunt": "1.5.3", From 688e9a53da9a20aa8fc4b04a28f121202ab479c5 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sat, 8 Oct 2022 09:06:29 +0000 Subject: [PATCH 068/150] Latest translations and fallbacks --- public/language/de/admin/advanced/cache.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/de/admin/advanced/cache.json b/public/language/de/admin/advanced/cache.json index e5c0e8fdfd..7818db96ec 100644 --- a/public/language/de/admin/advanced/cache.json +++ b/public/language/de/admin/advanced/cache.json @@ -1,8 +1,8 @@ { "post-cache": "Post-Cache", - "group-cache": "Group Cache", - "local-cache": "Local Cache", - "object-cache": "Object Cache", + "group-cache": "Gruppen-Cache", + "local-cache": "Lokaler Cache", + "object-cache": "Objekt-Cache", "percent-full": "%1% Voll", "post-cache-size": "Post-Cache-Größe", "items-in-cache": "Elemente im Cache" From ff53064cc8642e9ea96beaee91f4e65dddb6c22e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 8 Oct 2022 20:08:32 -0400 Subject: [PATCH 069/150] fix(deps): update dependency express to v4.18.2 (#10948) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 4702cc9e83..db110c551c 100644 --- a/install/package.json +++ b/install/package.json @@ -59,7 +59,7 @@ "daemon": "1.1.0", "diff": "5.1.0", "esbuild": "0.15.10", - "express": "4.18.1", + "express": "4.18.2", "express-session": "1.17.3", "express-useragent": "1.0.15", "file-loader": "6.2.0", From 0f63947b4d1f6b72de69c1a124cad71bccf3e8de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 8 Oct 2022 20:08:45 -0400 Subject: [PATCH 070/150] fix(deps): update dependency body-parser to v1.20.1 (#10941) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index db110c551c..30a725dccf 100644 --- a/install/package.json +++ b/install/package.json @@ -36,7 +36,7 @@ "autoprefixer": "10.4.12", "bcryptjs": "2.4.3", "benchpressjs": "2.4.3", - "body-parser": "1.20.0", + "body-parser": "1.20.1", "bootbox": "5.5.3", "bootstrap": "3.4.1", "chalk": "4.1.2", From eec683dd39a0140b874a9f037afde6f1dc2bcf38 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sun, 9 Oct 2022 09:06:13 +0000 Subject: [PATCH 071/150] Latest translations and fallbacks --- public/language/de/global.json | 2 +- public/language/tr/admin/advanced/cache.json | 6 +++--- public/language/tr/admin/settings/post.json | 2 +- public/language/tr/admin/settings/reputation.json | 8 ++++---- public/language/tr/user.json | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/language/de/global.json b/public/language/de/global.json index c9f894223a..fa6d78dcdf 100644 --- a/public/language/de/global.json +++ b/public/language/de/global.json @@ -18,7 +18,7 @@ "posting_restriction_info": "Nur registrierte Mitglieder dürfen Beiträge verfassen. Hier klicken zum Anmelden.", "welcome_back": "Willkommen zurück", "you_have_successfully_logged_in": "Du hast dich erfolgreich angemeldet", - "save_changes": "Speichere Änderungen", + "save_changes": "Änderungen speichern", "save": "Speichern", "close": "Schließen", "pagination": "Seitennummerierung", diff --git a/public/language/tr/admin/advanced/cache.json b/public/language/tr/admin/advanced/cache.json index a3f3620c89..a22bd4e060 100644 --- a/public/language/tr/admin/advanced/cache.json +++ b/public/language/tr/admin/advanced/cache.json @@ -1,8 +1,8 @@ { "post-cache": "İleti Önbelleği", - "group-cache": "Group Cache", - "local-cache": "Local Cache", - "object-cache": "Object Cache", + "group-cache": "Grup Önbelleği", + "local-cache": "Yerel Önbellek", + "object-cache": "Öğe Önbelleği", "percent-full": "%1% Tam", "post-cache-size": "İleti Önbellek Boyutu", "items-in-cache": "Önbellekteki Öğeler" diff --git a/public/language/tr/admin/settings/post.json b/public/language/tr/admin/settings/post.json index d3577d4d42..8034b6f1d6 100644 --- a/public/language/tr/admin/settings/post.json +++ b/public/language/tr/admin/settings/post.json @@ -51,7 +51,7 @@ "signature.disable": "İmzaları devre dışı bırak", "signature.no-links": "İmzalarda linkleri devre dışı bırak", "signature.no-images": "İmzalarda resimleri devre dışı bırak", - "signature.hide-duplicates": "Hide duplicate signatures in topics", + "signature.hide-duplicates": "Başlıklardaki ikinci kopya imzaları gizle", "signature.max-length": "Maksimum İmza Uzunluğu", "composer": "Editör Ayarları", "composer-help": "Aşağıdaki ayarlar, yeni konular oluşturduklarında veya mevcut konulara cevap verdiklerinde kullanıcıların \n\t\t\t\tyazı alanının işlevselliğini ve / veya görünümünü yönetmelerini sağlar.", diff --git a/public/language/tr/admin/settings/reputation.json b/public/language/tr/admin/settings/reputation.json index 797b2e2550..57d50011b6 100644 --- a/public/language/tr/admin/settings/reputation.json +++ b/public/language/tr/admin/settings/reputation.json @@ -24,8 +24,8 @@ "flags.limit-per-target-help": "Bir gönderi veya kullanıcı birden çok kez şikayet edildiğinde, her ek şikayet bir \"rapor\" olarak kabul edilir ve orijinal şikayete eklenir. Bir öğenin alabileceği rapor sayısını sınırlamak için bu seçeneği sıfırdan farklı bir sayıya ayarlayın.", "flags.auto-flag-on-downvote-threshold": "Bir iletinin otomatik olarak raporlanması için alması gereken eksi oy sayısı ( Otomatik şikayet özelliğini iptal etmek için buraya 0 giriniz, varsayılan: 0)", "flags.auto-resolve-on-ban": "Bir kullanıcı forumdan yasaklandığında otomatik olarak şikayetlerini çözülmüş say", - "flags.action-on-resolve": "Do the following when a flag is resolved", - "flags.action-on-reject": "Do the following when a flag is rejected", - "flags.action.nothing": "Do nothing", - "flags.action.rescind": "Rescind the notification send to moderators/administrators" + "flags.action-on-resolve": "Bir şikayet çözümlendiğinde şunu yap", + "flags.action-on-reject": "Bir şikayet reddedildiğinde şunu yap", + "flags.action.nothing": "Hiçbir şey yapma", + "flags.action.rescind": "Moderatör ve Adminlere gönderilen bildirimleri iptal et" } \ No newline at end of file diff --git a/public/language/tr/user.json b/public/language/tr/user.json index b687e2de43..1809554c6d 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -195,5 +195,5 @@ "emailUpdate.optional": "Bu bölüm tercihe bağlıdır. Bir e-posta adresi girmek zorunda değilsiniz, fakat onaylanmış bir e-posta adresi olmadan hesabınızı veya girişinizi e-posta adresiniz ile kurtaramazsınız. ", "emailUpdate.required": "Bu bölüm zorunludur.", "emailUpdate.change-instructions": "Girilen e-posta adresine kişiye özel bir bağlantı içeren bir onay e-postası gönderilecektir. Bu bağlantıya erişmek, e-posta adresinin sahibi olduğunuzu onaylayacak ve hesabınızda etkin hale gelecektir. İstediğiniz zaman, hesap sayfanızdan kayıtlı e-postanızı güncelleyebilirsiniz.", - "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership." + "emailUpdate.password-challenge": "Hesabın size ait olduğunu doğrulamak için lütfen şifrenizi giriniz" } \ No newline at end of file From b68faa095ae5a8ef338f7fe21c7584d9db230735 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 09:54:34 -0400 Subject: [PATCH 072/150] fix(deps): update dependency nodebb-plugin-spam-be-gone to v1.0.2 (#10958) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 30a725dccf..c42d27d2d0 100644 --- a/install/package.json +++ b/install/package.json @@ -96,7 +96,7 @@ "nodebb-plugin-emoji-android": "3.0.0", "nodebb-plugin-markdown": "10.1.0", "nodebb-plugin-mentions": "3.0.11", - "nodebb-plugin-spam-be-gone": "1.0.1", + "nodebb-plugin-spam-be-gone": "1.0.2", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", "nodebb-theme-persona": "12.1.7", From 3c2a636c22152c3638bfb2af2b62a3f0bab8eac7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 22:58:29 +0000 Subject: [PATCH 073/150] fix(deps): update dependency postcss to v8.4.18 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index c42d27d2d0..0177f8a720 100644 --- a/install/package.json +++ b/install/package.json @@ -110,7 +110,7 @@ "passport-local": "1.0.0", "pg": "8.8.0", "pg-cursor": "2.7.4", - "postcss": "8.4.17", + "postcss": "8.4.18", "postcss-clean": "1.2.0", "prompt": "1.3.0", "ioredis": "5.2.3", From 60d0145b18835c26a09f7286ac27423e115b6831 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 13:55:51 +0000 Subject: [PATCH 074/150] fix(deps): update dependency nodebb-plugin-mentions to v3.0.12 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 0177f8a720..0cf01f604a 100644 --- a/install/package.json +++ b/install/package.json @@ -95,7 +95,7 @@ "nodebb-plugin-emoji": "4.0.5", "nodebb-plugin-emoji-android": "3.0.0", "nodebb-plugin-markdown": "10.1.0", - "nodebb-plugin-mentions": "3.0.11", + "nodebb-plugin-mentions": "3.0.12", "nodebb-plugin-spam-be-gone": "1.0.2", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", From 3a70530c8e6d894ab2a56f20a3c40bf8e5386f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 13 Oct 2022 10:09:23 -0400 Subject: [PATCH 075/150] fix active plugins (#10964) --- src/meta/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meta/build.js b/src/meta/build.js index 0647cc7e0d..5f272387b3 100644 --- a/src/meta/build.js +++ b/src/meta/build.js @@ -201,7 +201,7 @@ exports.webpack = async function (options) { const util = require('util'); const plugins = require('../plugins/data'); - const activePlugins = await plugins.getActive(); + const activePlugins = (await plugins.getActive()).map(p => p.id); if (!activePlugins.includes('nodebb-plugin-composer-default')) { activePlugins.push('nodebb-plugin-composer-default'); } From 647bbd57aff263428af2ef10ce39c23dc9e558a7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 23:21:21 +0000 Subject: [PATCH 076/150] fix(deps): update dependency @isaacs/ttlcache to v1.2.1 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 0cf01f604a..09e7e6e4ba 100644 --- a/install/package.json +++ b/install/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", - "@isaacs/ttlcache": "1.2.0", + "@isaacs/ttlcache": "1.2.1", "ace-builds": "1.11.2", "archiver": "5.3.1", "async": "3.2.4", From ff69c3e185f2e9a7e41ec6bbc742acec2aa1fab0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Oct 2022 15:07:31 +0000 Subject: [PATCH 077/150] fix(deps): update dependency esbuild to v0.15.11 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 09e7e6e4ba..1e3f30056f 100644 --- a/install/package.json +++ b/install/package.json @@ -58,7 +58,7 @@ "csurf": "1.11.0", "daemon": "1.1.0", "diff": "5.1.0", - "esbuild": "0.15.10", + "esbuild": "0.15.11", "express": "4.18.2", "express-session": "1.17.3", "express-useragent": "1.0.15", From dcca339772b7a0f0317ffe992f94a49039aa4c41 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 16:14:02 +0000 Subject: [PATCH 078/150] fix(deps): update dependency nodebb-plugin-emoji to v4.0.6 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 1e3f30056f..97d1fb6225 100644 --- a/install/package.json +++ b/install/package.json @@ -92,7 +92,7 @@ "nodebb-plugin-2factor": "5.1.1", "nodebb-plugin-composer-default": "9.2.0", "nodebb-plugin-dbsearch": "5.1.5", - "nodebb-plugin-emoji": "4.0.5", + "nodebb-plugin-emoji": "4.0.6", "nodebb-plugin-emoji-android": "3.0.0", "nodebb-plugin-markdown": "10.1.0", "nodebb-plugin-mentions": "3.0.12", From fb41fbe7ae3b652ce044034c3c7ce15874f21d75 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Oct 2022 17:24:34 -0400 Subject: [PATCH 079/150] fix(deps): update socket.io packages to v4.5.3 (#10977) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 97d1fb6225..bd8305aac4 100644 --- a/install/package.json +++ b/install/package.json @@ -124,8 +124,8 @@ "sharp": "0.31.1", "sitemap": "7.1.1", "slideout": "1.0.1", - "socket.io": "4.5.2", - "socket.io-client": "4.5.2", + "socket.io": "4.5.3", + "socket.io-client": "4.5.3", "@socket.io/redis-adapter": "7.2.0", "sortablejs": "1.15.0", "spdx-license-list": "6.6.0", From 00ce8fd85e2fbbd946db59568fa20df7d1dd33f5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Oct 2022 17:25:21 -0400 Subject: [PATCH 080/150] fix(deps): update dependency ace-builds to v1.12.0 (#10978) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index bd8305aac4..5aa9cead66 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.1", - "ace-builds": "1.11.2", + "ace-builds": "1.12.0", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.12", From ffa117ab7979a1ba5269d7ba7784a02bdaa764e4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Oct 2022 18:07:11 -0400 Subject: [PATCH 081/150] chore(deps): update dependency mocha to v10.1.0 (#10980) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 5aa9cead66..90d8161435 100644 --- a/install/package.json +++ b/install/package.json @@ -159,7 +159,7 @@ "husky": "8.0.1", "jsdom": "20.0.1", "lint-staged": "13.0.3", - "mocha": "10.0.0", + "mocha": "10.1.0", "mocha-lcov-reporter": "1.3.0", "mockdate": "3.0.5", "nyc": "15.1.0", From 6485bc2539fb4382c30e590874932c5bbcfdf9c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 09:50:18 +0000 Subject: [PATCH 082/150] fix(deps): update dependency ace-builds to v1.12.1 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 90d8161435..9f9e842bc2 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.1", - "ace-builds": "1.12.0", + "ace-builds": "1.12.1", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.12", From 773a97446a8f1256065ca86f5b951da5c882ce20 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Tue, 18 Oct 2022 09:06:36 +0000 Subject: [PATCH 083/150] Latest translations and fallbacks --- public/language/he/admin/settings/email.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/language/he/admin/settings/email.json b/public/language/he/admin/settings/email.json index ff9dd91896..c2f1b3c6ef 100644 --- a/public/language/he/admin/settings/email.json +++ b/public/language/he/admin/settings/email.json @@ -13,7 +13,7 @@ "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select "Custom Service" and enter the details below.", "smtp-transport.gmail-warning1": "If you are using GMail as your email provider, you will have to generate an "App Password" in order for NodeBB to authenticate successfully. You can generate one at the App Passwords page.", "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "smtp-transport.auto-enable-toast": "נראה שאתה מגדיר חיבור SMTP. הפעלנו עבורך את אפשרות \"תעבורת SMTP\".", + "smtp-transport.auto-enable-toast": "It looks like you're configuring an SMTP transport. We enabled the \"SMTP Transport\" option for you.", "smtp-transport.host": "SMTP Host", "smtp-transport.port": "SMTP Port", "smtp-transport.security": "Connection security", @@ -39,10 +39,10 @@ "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
      The approximate server time is:
      The next daily digest is scheduled to be sent ", "notifications.remove-images": "הסר תמונות מהודעות דוא\"ל", "require-email-address": "דרוש ממשתמשים חדשים כתובת אימייל", - "require-email-address-warning": "כברירת מחדל, משתמשים יכולים לבטל את הסכמתם להזנת כתובת דוא\"ל על ידי השארת השדה ריק. הפעלת אפשרות זו פירושה שהם צריכים להזין כתובת דואר אלקטרוני כדי להמשיך ברישום. זה לא מבטיח שהמשתמש יזין כתובת אימייל אמיתית, ואפילו לא כתובת שבבעלותו.", - "send-validation-email": "שלח דוא\"ל אימות כאשר נוסף או משתנה דוא\"ל", + "require-email-address-warning": "By default, users can opt-out of entering an email address by leaving the field blank. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.", + "send-validation-email": "Send validation emails when an email is added or changed", "include-unverified-emails": "שלח דוא\"ל גם למשתמשים שלא אימתו את הכתובת שלהם", - "include-unverified-warning": "כברירת מחדל, משתמשים עם אימיילים המשויכים לחשבון שלהם כבר אומתו, אך ישנם מצבים שבהם זה לא המקרה (למשל כניסות SSO, או משתמשים קיימים וכו'). הפעל הגדרה זו על אחריותך בלבד - שליחת אימיילים לכתובות לא מאומתות עשויה להיות הפרה של חוקי אנטי-ספאם אזוריים.", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws.", "prompt": "בקש מהמשתמשים להגדיר/לאמת את כתובת הדוא\"ל שלהם", "prompt-help": "הצג אזהרה למשתמשים שהדוא\"ל שלהם לא מוגדר/לא מאומת", "sendEmailToBanned": "שלח אימיילים גם למשתמשים מורחקים" From 4260f0c2455ee960fdb60a3a76356c57b2079405 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Oct 2022 11:51:00 +0000 Subject: [PATCH 084/150] fix(deps): update dependency ace-builds to v1.12.2 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 9f9e842bc2..c8eb544c9d 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.1", - "ace-builds": "1.12.1", + "ace-builds": "1.12.2", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.12", From 9900e5f4fd3a9a30ee2392ef80c00e46b64d186a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Oct 2022 09:12:54 -0400 Subject: [PATCH 085/150] fix(deps): update dependency nodebb-theme-persona to v12.1.8 (#10982) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index c8eb544c9d..bf67535313 100644 --- a/install/package.json +++ b/install/package.json @@ -99,7 +99,7 @@ "nodebb-plugin-spam-be-gone": "1.0.2", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", - "nodebb-theme-persona": "12.1.7", + "nodebb-theme-persona": "12.1.8", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", From 1e930f9d17997b670ef34231dcb3280f029da5d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Oct 2022 17:08:53 +0000 Subject: [PATCH 086/150] fix(deps): update dependency ace-builds to v1.12.3 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index bf67535313..e4309ea298 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.1", - "ace-builds": "1.12.2", + "ace-builds": "1.12.3", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.12", From 9ad3b214d6137c92ad9cbb778f41d38353b80f49 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Tue, 18 Oct 2022 19:39:53 +0000 Subject: [PATCH 087/150] chore(i18n): fallback strings for new resources: nodebb.admin-settings-user, nodebb.admin-settings-email --- public/language/ar/admin/settings/email.json | 3 +++ public/language/ar/admin/settings/user.json | 2 +- public/language/bg/admin/settings/email.json | 3 +++ public/language/bg/admin/settings/user.json | 2 +- public/language/bn/admin/settings/email.json | 3 +++ public/language/cs/admin/settings/email.json | 3 +++ public/language/cs/admin/settings/user.json | 2 +- public/language/da/admin/settings/email.json | 3 +++ public/language/de/admin/settings/email.json | 3 +++ public/language/de/admin/settings/user.json | 2 +- public/language/el/admin/settings/email.json | 3 +++ public/language/en-US/admin/settings/email.json | 3 +++ public/language/en-x-pirate/admin/settings/email.json | 3 +++ public/language/es/admin/settings/email.json | 3 +++ public/language/es/admin/settings/user.json | 2 +- public/language/et/admin/settings/email.json | 3 +++ public/language/fa-IR/admin/settings/email.json | 3 +++ public/language/fi/admin/settings/email.json | 3 +++ public/language/fr/admin/settings/email.json | 3 +++ public/language/fr/admin/settings/user.json | 2 +- public/language/gl/admin/settings/email.json | 3 +++ public/language/he/admin/settings/email.json | 3 +++ public/language/he/admin/settings/user.json | 2 +- public/language/hr/admin/settings/email.json | 3 +++ public/language/hr/admin/settings/user.json | 2 +- public/language/hu/admin/settings/email.json | 3 +++ public/language/hu/admin/settings/user.json | 2 +- public/language/id/admin/settings/email.json | 3 +++ public/language/it/admin/settings/email.json | 3 +++ public/language/it/admin/settings/user.json | 2 +- public/language/ja/admin/settings/email.json | 3 +++ public/language/ja/admin/settings/user.json | 2 +- public/language/ko/admin/settings/email.json | 3 +++ public/language/ko/admin/settings/user.json | 2 +- public/language/lt/admin/settings/email.json | 3 +++ public/language/lv/admin/settings/email.json | 3 +++ public/language/lv/admin/settings/user.json | 2 +- public/language/ms/admin/settings/email.json | 3 +++ public/language/nb/admin/settings/email.json | 3 +++ public/language/nb/admin/settings/user.json | 2 +- public/language/nl/admin/settings/email.json | 3 +++ public/language/pl/admin/settings/email.json | 3 +++ public/language/pl/admin/settings/user.json | 2 +- public/language/pt-BR/admin/settings/email.json | 3 +++ public/language/pt-BR/admin/settings/user.json | 2 +- public/language/pt-PT/admin/settings/email.json | 3 +++ public/language/ro/admin/settings/email.json | 3 +++ public/language/ru/admin/settings/email.json | 3 +++ public/language/ru/admin/settings/user.json | 2 +- public/language/rw/admin/settings/email.json | 3 +++ public/language/sc/admin/settings/email.json | 3 +++ public/language/sk/admin/settings/email.json | 3 +++ public/language/sk/admin/settings/user.json | 2 +- public/language/sl/admin/settings/email.json | 3 +++ public/language/sq-AL/admin/settings/email.json | 3 +++ public/language/sr/admin/settings/email.json | 3 +++ public/language/sr/admin/settings/user.json | 2 +- public/language/sv/admin/settings/email.json | 3 +++ public/language/th/admin/settings/email.json | 3 +++ public/language/tr/admin/settings/email.json | 3 +++ public/language/tr/admin/settings/user.json | 2 +- public/language/uk/admin/settings/email.json | 3 +++ public/language/uk/admin/settings/user.json | 2 +- public/language/vi/admin/settings/email.json | 3 +++ public/language/vi/admin/settings/user.json | 2 +- public/language/zh-CN/admin/settings/email.json | 3 +++ public/language/zh-CN/admin/settings/user.json | 2 +- public/language/zh-TW/admin/settings/email.json | 3 +++ public/language/zh-TW/admin/settings/user.json | 2 +- 69 files changed, 159 insertions(+), 24 deletions(-) diff --git a/public/language/ar/admin/settings/email.json b/public/language/ar/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/ar/admin/settings/email.json +++ b/public/language/ar/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/ar/admin/settings/user.json b/public/language/ar/admin/settings/user.json index 4c6829de8f..56f835492a 100644 --- a/public/language/ar/admin/settings/user.json +++ b/public/language/ar/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "المصادقة", "email-confirm-interval": "لا يمكن للمستخدم إعادة إرسال رسالة تأكيد البريد الالكتروني حتى مرور", - "email-confirm-interval2": "دقائق", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "السماح بتسجيل الدخول باستخدام", "allow-login-with.username-email": "اسم المستخدم أو البريد الالكتروني", "allow-login-with.username": "اسم المستخدم فقط", diff --git a/public/language/bg/admin/settings/email.json b/public/language/bg/admin/settings/email.json index cab27f8c59..f0c85e5d99 100644 --- a/public/language/bg/admin/settings/email.json +++ b/public/language/bg/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Име за полето „От“", "from-help": "Името на изпращача, което да бъде показано в е-писмото.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Транспорт чрез SMTP", "smtp-transport.enabled": "Включване на транспорта чрез SMTP", "smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.", diff --git a/public/language/bg/admin/settings/user.json b/public/language/bg/admin/settings/user.json index af5aa57464..fc8aca5b11 100644 --- a/public/language/bg/admin/settings/user.json +++ b/public/language/bg/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Удостоверяване", "email-confirm-interval": "Потребителят не може да изпраща повторно е-писмото за потвърждение, преди да са минали", - "email-confirm-interval2": "минути", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Позволяване на вписването чрез", "allow-login-with.username-email": "Потребителско име или е-поща", "allow-login-with.username": "Само потребителско име", diff --git a/public/language/bn/admin/settings/email.json b/public/language/bn/admin/settings/email.json index 03f53c6c75..cacfb095b9 100644 --- a/public/language/bn/admin/settings/email.json +++ b/public/language/bn/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/cs/admin/settings/email.json b/public/language/cs/admin/settings/email.json index aa3253c18b..fadb159ee1 100644 --- a/public/language/cs/admin/settings/email.json +++ b/public/language/cs/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Jméno – od", "from-help": "Zobrazené jméno v e-mailu v – Od", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Přenos SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Ze seznamu můžete vybrat známé služby nebo zadat vlastní.", diff --git a/public/language/cs/admin/settings/user.json b/public/language/cs/admin/settings/user.json index 6e10f3f8c4..da3647a63f 100644 --- a/public/language/cs/admin/settings/user.json +++ b/public/language/cs/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Ověření", "email-confirm-interval": "Uživatel nesmí požádat o znovu zaslání potvrzujícího e-mailu do", - "email-confirm-interval2": "minut uplynulo", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Povolit přihlášení pomocí", "allow-login-with.username-email": "Uživatelské jméno nebo e-mail", "allow-login-with.username": "Pouze uživatelské jméno", diff --git a/public/language/da/admin/settings/email.json b/public/language/da/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/da/admin/settings/email.json +++ b/public/language/da/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/de/admin/settings/email.json b/public/language/de/admin/settings/email.json index 0c0ccd8a4d..1444ca221c 100644 --- a/public/language/de/admin/settings/email.json +++ b/public/language/de/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Name des Absenders", "from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Konfiguration", "smtp-transport.enabled": "SMTP-Transport aktivieren", "smtp-transport-help": "Du kannst aus einer Liste bekannter Email-Provider auswählen, oder einen benutzerdefinierten eingeben.", diff --git a/public/language/de/admin/settings/user.json b/public/language/de/admin/settings/user.json index e89b47c755..70dcbf5a0f 100644 --- a/public/language/de/admin/settings/user.json +++ b/public/language/de/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Authentifizierung", "email-confirm-interval": "Der Benutzer kann für ", - "email-confirm-interval2": " Minuten keine Bestätigungsmail erneut senden.", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Erlaube Login mit", "allow-login-with.username-email": "Benutzername oder E-Mail", "allow-login-with.username": "Nur Benutzername", diff --git a/public/language/el/admin/settings/email.json b/public/language/el/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/el/admin/settings/email.json +++ b/public/language/el/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/en-US/admin/settings/email.json b/public/language/en-US/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/en-US/admin/settings/email.json +++ b/public/language/en-US/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/en-x-pirate/admin/settings/email.json b/public/language/en-x-pirate/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/en-x-pirate/admin/settings/email.json +++ b/public/language/en-x-pirate/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/es/admin/settings/email.json b/public/language/es/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/es/admin/settings/email.json +++ b/public/language/es/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/es/admin/settings/user.json b/public/language/es/admin/settings/user.json index 14c840f44c..60eebe04bf 100644 --- a/public/language/es/admin/settings/user.json +++ b/public/language/es/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Autenticación", "email-confirm-interval": "El usuario no puede re-enviar una confirmación por email hasta", - "email-confirm-interval2": "minutos han pasado", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Permitir login con", "allow-login-with.username-email": "Nombre de usuario o Email", "allow-login-with.username": "Solo Nombre de Usuario", diff --git a/public/language/et/admin/settings/email.json b/public/language/et/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/et/admin/settings/email.json +++ b/public/language/et/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/fa-IR/admin/settings/email.json b/public/language/fa-IR/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/fa-IR/admin/settings/email.json +++ b/public/language/fa-IR/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/fi/admin/settings/email.json b/public/language/fi/admin/settings/email.json index 3557bacfc7..740998a605 100644 --- a/public/language/fi/admin/settings/email.json +++ b/public/language/fi/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/fr/admin/settings/email.json b/public/language/fr/admin/settings/email.json index 3d3a4b8f4f..a741aa8dbf 100644 --- a/public/language/fr/admin/settings/email.json +++ b/public/language/fr/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Nom de l’expéditeur", "from-help": "Le nom de l’expéditeur à afficher dans l'e-mail", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Protocole SMTP", "smtp-transport.enabled": "Activer l'envoi via SMTP", "smtp-transport-help": "Vous pouvez sélectionner depuis une liste de services ou entrer un service personnalisé.", diff --git a/public/language/fr/admin/settings/user.json b/public/language/fr/admin/settings/user.json index a6e6c9f25f..fffa2c31a5 100644 --- a/public/language/fr/admin/settings/user.json +++ b/public/language/fr/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Authentification", "email-confirm-interval": "Les utilisateurs ne peuvent pas demander un e-mail de vérification avant", - "email-confirm-interval2": "minutes se sont écoulées", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Autoriser l'identification avec", "allow-login-with.username-email": "Nom d'utilisateur ou e-mail", "allow-login-with.username": "Nom d'utilisateur uniquement", diff --git a/public/language/gl/admin/settings/email.json b/public/language/gl/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/gl/admin/settings/email.json +++ b/public/language/gl/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/he/admin/settings/email.json b/public/language/he/admin/settings/email.json index c2f1b3c6ef..1b37b35a28 100644 --- a/public/language/he/admin/settings/email.json +++ b/public/language/he/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "מאת", "from-help": "השם 'מאת' יוצג בדוא\"ל.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/he/admin/settings/user.json b/public/language/he/admin/settings/user.json index 5eccb6c935..6601d20392 100644 --- a/public/language/he/admin/settings/user.json +++ b/public/language/he/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "אימות", "email-confirm-interval": "המשתמש לא יוכל לשלוח הודעת אישור מייל עד שיחלוף", - "email-confirm-interval2": "דקות", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "אפשר התחברות עם", "allow-login-with.username-email": "שם משתמש או סיסמא", "allow-login-with.username": "שם משתמש בלבד", diff --git a/public/language/hr/admin/settings/email.json b/public/language/hr/admin/settings/email.json index d18d0cc705..3030ec0a35 100644 --- a/public/language/hr/admin/settings/email.json +++ b/public/language/hr/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Od imena", "from-help": "Ime prikazano u dolaznom emailu.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/hr/admin/settings/user.json b/public/language/hr/admin/settings/user.json index 43c20bfdb1..e1aa153b52 100644 --- a/public/language/hr/admin/settings/user.json +++ b/public/language/hr/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Autentifikacija", "email-confirm-interval": "Korisnik ne može ponovno poslati potvrdni email do ", - "email-confirm-interval2": "prošlo je minuta", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Dozvoli prijavu sa", "allow-login-with.username-email": "Korisničko ime ili Email", "allow-login-with.username": "Korisničko ime", diff --git a/public/language/hu/admin/settings/email.json b/public/language/hu/admin/settings/email.json index 22c226247d..f458051251 100644 --- a/public/language/hu/admin/settings/email.json +++ b/public/language/hu/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Feladó neve", "from-help": "Az emailben megjelenített feladói név.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP beállítások", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Válogathatsz a jól ismert szolgáltatások listájából vagy megadhatsz sajátot.", diff --git a/public/language/hu/admin/settings/user.json b/public/language/hu/admin/settings/user.json index 3db2f70226..f679e5b510 100644 --- a/public/language/hu/admin/settings/user.json +++ b/public/language/hu/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Hitelesítés", "email-confirm-interval": "A felhasználó nem küldetheti újra az emailt ameddig nem telt el", - "email-confirm-interval2": "perc", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Bejelentkezés engedélyezése ezzel:", "allow-login-with.username-email": "Felhasználónév vagy email cím", "allow-login-with.username": "Csak felhasználónév", diff --git a/public/language/id/admin/settings/email.json b/public/language/id/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/id/admin/settings/email.json +++ b/public/language/id/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/it/admin/settings/email.json b/public/language/it/admin/settings/email.json index 4d99b4399c..ed2ab28a3d 100644 --- a/public/language/it/admin/settings/email.json +++ b/public/language/it/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Da Nome", "from-help": "Il nome da visualizzare nell'email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Trasporto SMTP", "smtp-transport.enabled": "Abilita trasporto SMTP", "smtp-transport-help": "Puoi selezionare da un elenco di servizi noti o inserirne uno personalizzato.", diff --git a/public/language/it/admin/settings/user.json b/public/language/it/admin/settings/user.json index e3d5969aa6..878a9b981b 100644 --- a/public/language/it/admin/settings/user.json +++ b/public/language/it/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Autenticazione", "email-confirm-interval": "L'utente non può mandare una nuova email di conferma fino a", - "email-confirm-interval2": "minuti trascorsi", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Consenti l'accesso con", "allow-login-with.username-email": "Username o Email", "allow-login-with.username": "Solo Username", diff --git a/public/language/ja/admin/settings/email.json b/public/language/ja/admin/settings/email.json index 400b5f1889..c08a7faccb 100644 --- a/public/language/ja/admin/settings/email.json +++ b/public/language/ja/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "名前から", "from-help": "メールからの名前が表示されます。", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/ja/admin/settings/user.json b/public/language/ja/admin/settings/user.json index cac5496aba..dcd8a4edaf 100644 --- a/public/language/ja/admin/settings/user.json +++ b/public/language/ja/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "認証", "email-confirm-interval": "ユーザーが確認するまでEメールを再送信しない", - "email-confirm-interval2": "分経過", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "ログインを許可", "allow-login-with.username-email": "ユーザー名または電子メール", "allow-login-with.username": "ユーザー名のみ", diff --git a/public/language/ko/admin/settings/email.json b/public/language/ko/admin/settings/email.json index 0b6d934886..9c90b4b582 100644 --- a/public/language/ko/admin/settings/email.json +++ b/public/language/ko/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "포럼 메일 발신자 이름", "from-help": "이메일에 표시할 발신자 이름", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "자주 사용되는 서비스 목록 중에 하나를 선택하거나 직접 입력할 수 있습니다.", diff --git a/public/language/ko/admin/settings/user.json b/public/language/ko/admin/settings/user.json index 01d7ea0ec3..ac9db811b2 100644 --- a/public/language/ko/admin/settings/user.json +++ b/public/language/ko/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "인증", "email-confirm-interval": "사용자는", - "email-confirm-interval2": "분이 지나기 전까지 인증 메일 재요청이 불가능합니다.", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "로그인 허용 수단", "allow-login-with.username-email": "사용자명 또는 이메일", "allow-login-with.username": "사용자명", diff --git a/public/language/lt/admin/settings/email.json b/public/language/lt/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/lt/admin/settings/email.json +++ b/public/language/lt/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/lv/admin/settings/email.json b/public/language/lv/admin/settings/email.json index bb154ee970..81815fc6af 100644 --- a/public/language/lv/admin/settings/email.json +++ b/public/language/lv/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Sūtītāja vārds vai nosaukums", "from-help": "Vārds vai nosaukums, ko saņēmējs redzēs kā sūtītāju.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP transports", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Izvēlies no labi zināmu pakalpojumu saraksta vai ievadi pielāgotu pakalpojumu.", diff --git a/public/language/lv/admin/settings/user.json b/public/language/lv/admin/settings/user.json index 78653597fd..9a3d3d0c7d 100644 --- a/public/language/lv/admin/settings/user.json +++ b/public/language/lv/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Autentifikācija", "email-confirm-interval": "Lietotājs nevar atkārtoti nosūtīt apstiprinājuma e-pastu pirms", - "email-confirm-interval2": "minūtes nav pagājušas", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Ielogoties", "allow-login-with.username-email": "Ar lietotājvārdu vai e-pasta adresi", "allow-login-with.username": "Tikai ar lietotājvārdu", diff --git a/public/language/ms/admin/settings/email.json b/public/language/ms/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/ms/admin/settings/email.json +++ b/public/language/ms/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/nb/admin/settings/email.json b/public/language/nb/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/nb/admin/settings/email.json +++ b/public/language/nb/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/nb/admin/settings/user.json b/public/language/nb/admin/settings/user.json index 47b00c8486..ae8826bb7f 100644 --- a/public/language/nb/admin/settings/user.json +++ b/public/language/nb/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Autentisering ", "email-confirm-interval": "Brukeren kan ikke sende en bekreftelses-e-post på nytt før", - "email-confirm-interval2": "minutter har gått", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Tillat innlogging med", "allow-login-with.username-email": "Brukernavn eller e-post", "allow-login-with.username": "Kun brukernavn", diff --git a/public/language/nl/admin/settings/email.json b/public/language/nl/admin/settings/email.json index 875a778a98..afbfe81aa2 100644 --- a/public/language/nl/admin/settings/email.json +++ b/public/language/nl/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Naam", "from-help": "De from naam om te tonen in de e-mail.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Je kunt een bekende dienst uit de lijst selecteren of vul een aangepaste dienst in.", diff --git a/public/language/pl/admin/settings/email.json b/public/language/pl/admin/settings/email.json index b0f60c4768..d68a780326 100644 --- a/public/language/pl/admin/settings/email.json +++ b/public/language/pl/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Pole „Od”", "from-help": "Nazwa „Od” widoczna w e-mailach", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Transport SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Możesz wybrać z listy dobrze znanych usług lub wskazać usługę niestandardową.", diff --git a/public/language/pl/admin/settings/user.json b/public/language/pl/admin/settings/user.json index e019daa806..0389a4abaa 100644 --- a/public/language/pl/admin/settings/user.json +++ b/public/language/pl/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Uwierzytelnianie", "email-confirm-interval": "Użytkownik nie może ponownie wysłać e-maila z potwierdzeniem, dopóki nie minie", - "email-confirm-interval2": "minut", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Zezwalaj na logowanie przy użyciu", "allow-login-with.username-email": "Nazwy użytkownika lub adresu email", "allow-login-with.username": "Tylko nazwy użytkownika", diff --git a/public/language/pt-BR/admin/settings/email.json b/public/language/pt-BR/admin/settings/email.json index 28e89bab67..1c56b7edcd 100644 --- a/public/language/pt-BR/admin/settings/email.json +++ b/public/language/pt-BR/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Por Nome (From)", "from-help": "O nome que será mostrado em \"De\" no e-mail.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Trasporte por SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Você pode escolher entre uma lista de serviços conhecidos ou adicionar um personalizado.", diff --git a/public/language/pt-BR/admin/settings/user.json b/public/language/pt-BR/admin/settings/user.json index a5b0a196a8..069cfb422f 100644 --- a/public/language/pt-BR/admin/settings/user.json +++ b/public/language/pt-BR/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Autenticação", "email-confirm-interval": "O usuário não pode reenviar um e-mail de confirmação até", - "email-confirm-interval2": "minutos decorridos", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Permitir login com", "allow-login-with.username-email": "Nome de Usuário ou E-mail", "allow-login-with.username": "Apenas Nome de Usuário", diff --git a/public/language/pt-PT/admin/settings/email.json b/public/language/pt-PT/admin/settings/email.json index 39197da34f..2c78449689 100644 --- a/public/language/pt-PT/admin/settings/email.json +++ b/public/language/pt-PT/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/ro/admin/settings/email.json b/public/language/ro/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/ro/admin/settings/email.json +++ b/public/language/ro/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/ru/admin/settings/email.json b/public/language/ru/admin/settings/email.json index 41e84d950c..8c519bc778 100644 --- a/public/language/ru/admin/settings/email.json +++ b/public/language/ru/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "От кого", "from-help": "Имя отправителя письма (или название форума).", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Сервис SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Выберите один из популярных сервисов или укажите свой почтовый сервер.", diff --git a/public/language/ru/admin/settings/user.json b/public/language/ru/admin/settings/user.json index 357396a153..cfd9c08a47 100644 --- a/public/language/ru/admin/settings/user.json +++ b/public/language/ru/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Авторизация", "email-confirm-interval": "Пользователь не сможет снова запросить код подтверждения, пока не пройдёт", - "email-confirm-interval2": "минут", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Разрешить вход с помощью", "allow-login-with.username-email": "Имени пользователя или адреса электронной почты", "allow-login-with.username": "Только имени пользователя", diff --git a/public/language/rw/admin/settings/email.json b/public/language/rw/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/rw/admin/settings/email.json +++ b/public/language/rw/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/sc/admin/settings/email.json b/public/language/sc/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/sc/admin/settings/email.json +++ b/public/language/sc/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/sk/admin/settings/email.json b/public/language/sk/admin/settings/email.json index 702de82895..f8d64a3462 100644 --- a/public/language/sk/admin/settings/email.json +++ b/public/language/sk/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Meno - od", "from-help": "Zobrazené meno v e-maily v - Od", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Prenos SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Zo zoznamu môžete vybrať známe služby alebo zadať vlastné.", diff --git a/public/language/sk/admin/settings/user.json b/public/language/sk/admin/settings/user.json index 0c3cddcb0a..18b8367c0b 100644 --- a/public/language/sk/admin/settings/user.json +++ b/public/language/sk/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Overenie", "email-confirm-interval": "Používateľ nesmie požiadať o znovu odoslanie potvrdzujúceho e-mailu do", - "email-confirm-interval2": "minút uplynulo", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Povoliť prihlásenie pomocou", "allow-login-with.username-email": "Používateľské meno alebo e-mail", "allow-login-with.username": "Iba používateľské meno", diff --git a/public/language/sl/admin/settings/email.json b/public/language/sl/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/sl/admin/settings/email.json +++ b/public/language/sl/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/sq-AL/admin/settings/email.json b/public/language/sq-AL/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/sq-AL/admin/settings/email.json +++ b/public/language/sq-AL/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/sr/admin/settings/email.json b/public/language/sr/admin/settings/email.json index e7c80966fb..7543180f27 100644 --- a/public/language/sr/admin/settings/email.json +++ b/public/language/sr/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Od koga", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/sr/admin/settings/user.json b/public/language/sr/admin/settings/user.json index c8fc77bfd9..041e750fcc 100644 --- a/public/language/sr/admin/settings/user.json +++ b/public/language/sr/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Auntentifikacija", "email-confirm-interval": "Korisnik možda neće moći da ponovo pošalje email konfirmaciju sve dok", - "email-confirm-interval2": "minuta je prošlo", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Dozvoli login sa", "allow-login-with.username-email": "Korisničko ime ili Email", "allow-login-with.username": "Samo korisničko ime", diff --git a/public/language/sv/admin/settings/email.json b/public/language/sv/admin/settings/email.json index bf487ccb99..a51b116c25 100644 --- a/public/language/sv/admin/settings/email.json +++ b/public/language/sv/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/th/admin/settings/email.json b/public/language/th/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/th/admin/settings/email.json +++ b/public/language/th/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/tr/admin/settings/email.json b/public/language/tr/admin/settings/email.json index 84d29b0242..bdebff56d6 100644 --- a/public/language/tr/admin/settings/email.json +++ b/public/language/tr/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "SMTP Aktarımını Etkinleştir", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/tr/admin/settings/user.json b/public/language/tr/admin/settings/user.json index 9c40e644a7..4b9c6a1952 100644 --- a/public/language/tr/admin/settings/user.json +++ b/public/language/tr/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Kimlik Doğrulama", "email-confirm-interval": "Kullanıcı onay e-postasını tekrar gönderemez", - "email-confirm-interval2": "dakika geçti", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Girişe izin ver:", "allow-login-with.username-email": "Kullanıcı Adı veya E-posta", "allow-login-with.username": "Sadece kullanıcı adı", diff --git a/public/language/uk/admin/settings/email.json b/public/language/uk/admin/settings/email.json index 046edf46d3..30dbc77964 100644 --- a/public/language/uk/admin/settings/email.json +++ b/public/language/uk/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Ім'я відправника", "from-help": "Ім'я відправника, що буде показано в електронних листах", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Протокол SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Ви можете обрати поштовий сервіс зі списку або використати ваш власний сервіс.", diff --git a/public/language/uk/admin/settings/user.json b/public/language/uk/admin/settings/user.json index 29a4291d57..cb43123c90 100644 --- a/public/language/uk/admin/settings/user.json +++ b/public/language/uk/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Аутентифікація", "email-confirm-interval": "Користувач не може повторно надіслати підтвердження електронної пошти поки не мине", - "email-confirm-interval2": "хвилин", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Дозволити вхід використовуючи", "allow-login-with.username-email": "Ім'я користувача або електронну пошту", "allow-login-with.username": "Тільки ім'я користувача", diff --git a/public/language/vi/admin/settings/email.json b/public/language/vi/admin/settings/email.json index 30cebf9d91..a1854f39a0 100644 --- a/public/language/vi/admin/settings/email.json +++ b/public/language/vi/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Tên Người Gửi", "from-help": "Tên người gửi hiển thị trong email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Truyền Tải SMTP", "smtp-transport.enabled": "Bật truyền tải SMTP", "smtp-transport-help": "Bạn có thể chọn từ danh sách các dịch vụ nổi bật hoặc nhập một dịch vụ tùy chỉnh.", diff --git a/public/language/vi/admin/settings/user.json b/public/language/vi/admin/settings/user.json index 6aa242566f..0fd9f6f18e 100644 --- a/public/language/vi/admin/settings/user.json +++ b/public/language/vi/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Xác thực", "email-confirm-interval": "Người dùng không thể gửi lại email xác nhận cho đến khi", - "email-confirm-interval2": "phút đã trôi qua", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "Cho phép đăng nhập với", "allow-login-with.username-email": "Tên Đăng Nhập hoặc Email", "allow-login-with.username": "Chỉ Tên Đăng Nhập", diff --git a/public/language/zh-CN/admin/settings/email.json b/public/language/zh-CN/admin/settings/email.json index 011373afd6..4d6570a579 100644 --- a/public/language/zh-CN/admin/settings/email.json +++ b/public/language/zh-CN/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "发送者", "from-help": "用于邮件中显示的发送者", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP 通信", "smtp-transport.enabled": "启用 SMTP 通信", "smtp-transport-help": "您可以从列表中选取一个已知的服务或自定义。", diff --git a/public/language/zh-CN/admin/settings/user.json b/public/language/zh-CN/admin/settings/user.json index 2eef5b6245..f78cc552c4 100644 --- a/public/language/zh-CN/admin/settings/user.json +++ b/public/language/zh-CN/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "验证", "email-confirm-interval": "用户无法重新发送电子邮箱激活直到", - "email-confirm-interval2": "分钟已经过", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "允许使用何种登录名", "allow-login-with.username-email": "用户名或者邮箱", "allow-login-with.username": "仅限用户名", diff --git a/public/language/zh-TW/admin/settings/email.json b/public/language/zh-TW/admin/settings/email.json index 71d8f17e6c..3289f089ee 100644 --- a/public/language/zh-TW/admin/settings/email.json +++ b/public/language/zh-TW/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "發送人", "from-help": "用於郵件中顯示的發送人", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP 通信", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "您可以從列表中選取一個已知的服務或自訂。", diff --git a/public/language/zh-TW/admin/settings/user.json b/public/language/zh-TW/admin/settings/user.json index 3af23f0a2b..6848e90747 100644 --- a/public/language/zh-TW/admin/settings/user.json +++ b/public/language/zh-TW/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "驗證", "email-confirm-interval": "使用者無法重新發送電子信箱確認信直到", - "email-confirm-interval2": "分鐘已經過", + "email-confirm-interval2": "minutes have elapsed", "allow-login-with": "允許使用何種登入名", "allow-login-with.username-email": "使用者名或者電子信箱", "allow-login-with.username": "僅限使用者名", From 8d6c0de7354f5cb5124c547838ceff66638530a4 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 19 Oct 2022 09:06:32 +0000 Subject: [PATCH 088/150] Latest translations and fallbacks --- public/language/bg/admin/settings/email.json | 4 ++-- public/language/bg/admin/settings/user.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/bg/admin/settings/email.json b/public/language/bg/admin/settings/email.json index f0c85e5d99..ccf78aba43 100644 --- a/public/language/bg/admin/settings/email.json +++ b/public/language/bg/admin/settings/email.json @@ -5,8 +5,8 @@ "from": "Име за полето „От“", "from-help": "Името на изпращача, което да бъде показано в е-писмото.", - "confirmation-settings": "Confirmation", - "confirmation.expiry": "Hours to keep email confirmation link valid", + "confirmation-settings": "Потвърждение", + "confirmation.expiry": "Продължителност на давността на връзката за потвърждаване, в часове", "smtp-transport": "Транспорт чрез SMTP", "smtp-transport.enabled": "Включване на транспорта чрез SMTP", diff --git a/public/language/bg/admin/settings/user.json b/public/language/bg/admin/settings/user.json index fc8aca5b11..618e3c7361 100644 --- a/public/language/bg/admin/settings/user.json +++ b/public/language/bg/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Удостоверяване", "email-confirm-interval": "Потребителят не може да изпраща повторно е-писмото за потвърждение, преди да са минали", - "email-confirm-interval2": "minutes have elapsed", + "email-confirm-interval2": "минути са изминали", "allow-login-with": "Позволяване на вписването чрез", "allow-login-with.username-email": "Потребителско име или е-поща", "allow-login-with.username": "Само потребителско име", From 7b9e08478c4a74027363d11594b34150be123bd6 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 19 Oct 2022 10:51:03 -0400 Subject: [PATCH 089/150] fix(deps): bump composer-default --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index bfd9201f1d..db678fe96f 100644 --- a/install/package.json +++ b/install/package.json @@ -90,7 +90,7 @@ "@nodebb/bootswatch": "3.4.2", "nconf": "0.12.0", "nodebb-plugin-2factor": "5.1.1", - "nodebb-plugin-composer-default": "9.2.0", + "nodebb-plugin-composer-default": "9.2.1", "nodebb-plugin-dbsearch": "5.1.5", "nodebb-plugin-emoji": "4.0.6", "nodebb-plugin-emoji-android": "3.0.0", @@ -189,4 +189,4 @@ "url": "https://github.com/barisusakli" } ] -} \ No newline at end of file +} From 6471b6989e4f204ee4b1c2d30e04846ca272a174 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 17:43:03 +0000 Subject: [PATCH 090/150] fix(deps): update dependency nodebb-theme-persona to v12.1.9 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index db678fe96f..5cf6f894fe 100644 --- a/install/package.json +++ b/install/package.json @@ -99,7 +99,7 @@ "nodebb-plugin-spam-be-gone": "1.0.2", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", - "nodebb-theme-persona": "12.1.8", + "nodebb-theme-persona": "12.1.9", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", From 1fc2f1e80c86c1577341821c45bbefe9807962b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 17:42:55 +0000 Subject: [PATCH 091/150] fix(deps): update dependency nodebb-plugin-composer-default to v9.2.2 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 5cf6f894fe..5fb16108e0 100644 --- a/install/package.json +++ b/install/package.json @@ -90,7 +90,7 @@ "@nodebb/bootswatch": "3.4.2", "nconf": "0.12.0", "nodebb-plugin-2factor": "5.1.1", - "nodebb-plugin-composer-default": "9.2.1", + "nodebb-plugin-composer-default": "9.2.2", "nodebb-plugin-dbsearch": "5.1.5", "nodebb-plugin-emoji": "4.0.6", "nodebb-plugin-emoji-android": "3.0.0", From 29fddd6577baab3c76f2233d9fc61a63c6f57ca3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 19:37:00 -0400 Subject: [PATCH 092/150] fix(deps): update dependency esbuild to v0.15.12 (#10996) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 5fb16108e0..bfcd676861 100644 --- a/install/package.json +++ b/install/package.json @@ -58,7 +58,7 @@ "csurf": "1.11.0", "daemon": "1.1.0", "diff": "5.1.0", - "esbuild": "0.15.11", + "esbuild": "0.15.12", "express": "4.18.2", "express-session": "1.17.3", "express-useragent": "1.0.15", From ee4fde1375c491ea6b5fd0107b0fca0c84245e3e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 19:38:57 -0400 Subject: [PATCH 093/150] fix(deps): update dependency nodebb-plugin-composer-default to v9.2.3 (#10997) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index bfcd676861..1b8e300584 100644 --- a/install/package.json +++ b/install/package.json @@ -90,7 +90,7 @@ "@nodebb/bootswatch": "3.4.2", "nconf": "0.12.0", "nodebb-plugin-2factor": "5.1.1", - "nodebb-plugin-composer-default": "9.2.2", + "nodebb-plugin-composer-default": "9.2.3", "nodebb-plugin-dbsearch": "5.1.5", "nodebb-plugin-emoji": "4.0.6", "nodebb-plugin-emoji-android": "3.0.0", From 248fd6721c1c176ec6bb51d497732458c62490cf Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Thu, 20 Oct 2022 09:06:36 +0000 Subject: [PATCH 094/150] Latest translations and fallbacks --- public/language/it/admin/settings/email.json | 4 ++-- public/language/it/admin/settings/user.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/it/admin/settings/email.json b/public/language/it/admin/settings/email.json index ed2ab28a3d..adbca929b5 100644 --- a/public/language/it/admin/settings/email.json +++ b/public/language/it/admin/settings/email.json @@ -5,8 +5,8 @@ "from": "Da Nome", "from-help": "Il nome da visualizzare nell'email.", - "confirmation-settings": "Confirmation", - "confirmation.expiry": "Hours to keep email confirmation link valid", + "confirmation-settings": "Conferma", + "confirmation.expiry": "Ore per mantenere valido il link di conferma dell'email", "smtp-transport": "Trasporto SMTP", "smtp-transport.enabled": "Abilita trasporto SMTP", diff --git a/public/language/it/admin/settings/user.json b/public/language/it/admin/settings/user.json index 878a9b981b..b418763c86 100644 --- a/public/language/it/admin/settings/user.json +++ b/public/language/it/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Autenticazione", "email-confirm-interval": "L'utente non può mandare una nuova email di conferma fino a", - "email-confirm-interval2": "minutes have elapsed", + "email-confirm-interval2": "sono trascorsi minuti", "allow-login-with": "Consenti l'accesso con", "allow-login-with.username-email": "Username o Email", "allow-login-with.username": "Solo Username", From be92be4eee65ab6cd33f7300136134dd96da5d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 20 Oct 2022 20:35:35 -0400 Subject: [PATCH 095/150] feat: add search data to filter:search.inContent --- src/search.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/search.js b/src/search.js index d5555a21fb..a46934ff2f 100644 --- a/src/search.js +++ b/src/search.js @@ -81,6 +81,7 @@ async function searchInContent(data) { const metadata = await plugins.hooks.fire('filter:search.inContent', { pids: allPids, + data: data, }); if (data.returnIds) { From 3a1866ce81641a407ebea8db0e8b321b5d4c191f Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Mon, 24 Oct 2022 09:06:07 +0000 Subject: [PATCH 096/150] Latest translations and fallbacks --- public/language/fr/admin/settings/email.json | 2 +- public/language/fr/admin/settings/user.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/language/fr/admin/settings/email.json b/public/language/fr/admin/settings/email.json index a741aa8dbf..42b64a4343 100644 --- a/public/language/fr/admin/settings/email.json +++ b/public/language/fr/admin/settings/email.json @@ -6,7 +6,7 @@ "from-help": "Le nom de l’expéditeur à afficher dans l'e-mail", "confirmation-settings": "Confirmation", - "confirmation.expiry": "Hours to keep email confirmation link valid", + "confirmation.expiry": "Heures de validité du lien de confirmation par e-mail", "smtp-transport": "Protocole SMTP", "smtp-transport.enabled": "Activer l'envoi via SMTP", diff --git a/public/language/fr/admin/settings/user.json b/public/language/fr/admin/settings/user.json index fffa2c31a5..a6e6c9f25f 100644 --- a/public/language/fr/admin/settings/user.json +++ b/public/language/fr/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Authentification", "email-confirm-interval": "Les utilisateurs ne peuvent pas demander un e-mail de vérification avant", - "email-confirm-interval2": "minutes have elapsed", + "email-confirm-interval2": "minutes se sont écoulées", "allow-login-with": "Autoriser l'identification avec", "allow-login-with.username-email": "Nom d'utilisateur ou e-mail", "allow-login-with.username": "Nom d'utilisateur uniquement", From c4ed02ee1d9dcb1fe96e33494b7b254fd4a62440 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 26 Oct 2022 09:06:14 +0000 Subject: [PATCH 097/150] Latest translations and fallbacks --- public/language/nb/admin/admin.json | 2 +- .../nb/admin/manage/registration.json | 4 +- public/language/nb/admin/manage/users.json | 4 +- public/language/nb/admin/settings/email.json | 42 +++++++++---------- .../language/nb/admin/settings/languages.json | 2 +- .../nb/admin/settings/reputation.json | 2 +- public/language/nb/admin/settings/user.json | 4 +- public/language/nb/email.json | 8 ++-- public/language/nb/error.json | 20 ++++----- public/language/nb/global.json | 8 ++-- public/language/nb/login.json | 2 +- public/language/nb/notifications.json | 4 +- public/language/nb/pages.json | 2 +- public/language/nb/register.json | 2 +- public/language/nb/user.json | 32 +++++++------- public/language/nb/users.json | 2 +- 16 files changed, 70 insertions(+), 70 deletions(-) diff --git a/public/language/nb/admin/admin.json b/public/language/nb/admin/admin.json index 83e867a30f..65bbbc4f99 100644 --- a/public/language/nb/admin/admin.json +++ b/public/language/nb/admin/admin.json @@ -5,7 +5,7 @@ "acp-title": "%1 | NodeBB Admin Kontrollpanel", "settings-header-contents": "Innhold", "changes-saved": "Endringer lagret", - "changes-saved-message": "Dine endringer til NodeBB-konfigurasjonen har blitt lagret.", + "changes-saved-message": "Dine endringer i NodeBB-konfigurasjonen har blitt lagret.", "changes-not-saved": "Endringer ikke lagret", "changes-not-saved-message": "NodeBB støtte på et problem ved lagring av endringer. (%1)" } \ No newline at end of file diff --git a/public/language/nb/admin/manage/registration.json b/public/language/nb/admin/manage/registration.json index f51b4d56e6..70676dfe9f 100644 --- a/public/language/nb/admin/manage/registration.json +++ b/public/language/nb/admin/manage/registration.json @@ -10,11 +10,11 @@ "list.email-spam": "Frequency: %1 Appears: %2", "list.ip-spam": "Frequency: %1 Appears: %2", - "invitations": "Invitations", + "invitations": "Invitasjoner", "invitations.description": "Below is a complete list of invitations sent. Use ctrl-f to search through the list by email or username.

      The username will be displayed to the right of the emails for users who have redeemed their invitations.", "invitations.inviter-username": "Inviter Username", "invitations.invitee-email": "Invitee Email", "invitations.invitee-username": "Invitee Username (if registered)", - "invitations.confirm-delete": "Are you sure you wish to delete this invitation?" + "invitations.confirm-delete": "Er du sikker på at du ønsker å slette denne invitasjonen?" } \ No newline at end of file diff --git a/public/language/nb/admin/manage/users.json b/public/language/nb/admin/manage/users.json index 0df8de0517..c63f6819b5 100644 --- a/public/language/nb/admin/manage/users.json +++ b/public/language/nb/admin/manage/users.json @@ -24,7 +24,7 @@ "filter-by": "Filter by", "pills.unvalidated": "Not Validated", "pills.validated": "Validated", - "pills.banned": "Banned", + "pills.banned": "Utestengt", "50-per-page": "50 per page", "100-per-page": "100 per page", @@ -105,7 +105,7 @@ "alerts.create-success": "User created!", "alerts.prompt-email": "Emails: ", - "alerts.email-sent-to": "An invitation email has been sent to %1", + "alerts.email-sent-to": "En invitasjonse-post har blitt sendt til %1", "alerts.x-users-found": "%1 user(s) found, (%2 seconds)", "export-users-started": "Exporting users as csv, this might take a while. You will receive a notification when it is complete.", "export-users-completed": "Users exported as csv, click here to download." diff --git a/public/language/nb/admin/settings/email.json b/public/language/nb/admin/settings/email.json index 35e713adc0..f5aa006956 100644 --- a/public/language/nb/admin/settings/email.json +++ b/public/language/nb/admin/settings/email.json @@ -1,9 +1,9 @@ { - "email-settings": "Email Settings", - "address": "Email Address", - "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", + "email-settings": "E-postinnstillinger", + "address": "E-postadresse", + "address-help": "Følgende e-postadresse viser til e-postadressen som mottakeren vil se i \"Fra\" og \"Svar til\"-feltene. ", "from": "From Name", - "from-help": "The from name to display in the email.", + "from-help": "Avsendernavnet som skal vises i e-posten.", "confirmation-settings": "Confirmation", "confirmation.expiry": "Hours to keep email confirmation link valid", @@ -16,37 +16,37 @@ "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select "Custom Service" and enter the details below.", "smtp-transport.gmail-warning1": "If you are using GMail as your email provider, you will have to generate an "App Password" in order for NodeBB to authenticate successfully. You can generate one at the App Passwords page.", "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "smtp-transport.auto-enable-toast": "It looks like you're configuring an SMTP transport. We enabled the \"SMTP Transport\" option for you.", + "smtp-transport.auto-enable-toast": "Det ser ut som at du konfigurerer en SMTP transport. Vi skrudde på «SMTP Transport»-alternativet for deg.", "smtp-transport.host": "SMTP Host", "smtp-transport.port": "SMTP Port", "smtp-transport.security": "Connection security", "smtp-transport.security-encrypted": "Encrypted", "smtp-transport.security-starttls": "StartTLS", "smtp-transport.security-none": "None", - "smtp-transport.username": "Username", + "smtp-transport.username": "Brukernavn", "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", "smtp-transport.password": "Password", "smtp-transport.pool": "Enable pooled connections", "smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.", - "template": "Edit Email Template", - "template.select": "Select Email Template", + "template": "Endre e-postmal", + "template.select": "Velg e-postmal", "template.revert": "Revert to Original", - "testing": "Email Testing", - "testing.select": "Select Email Template", - "testing.send": "Send Test Email", + "testing": "E-posttesting", + "testing.select": "Velg e-postmal", + "testing.send": "Send test-e-post", "testing.send-help": "The test email will be sent to the currently logged in user's email address.", - "subscriptions": "Email Digests", - "subscriptions.disable": "Disable email digests", + "subscriptions": "E-postsammendrag", + "subscriptions.disable": "Deaktiver e-postsammendrag", "subscriptions.hour": "Digest Hour", - "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
      The approximate server time is:
      The next daily digest is scheduled to be sent ", + "subscriptions.hour-help": "Skriv inn et tall som representerer den timen planlagte e-postsammendrag skal sendes ut (f.eks. 0 for midnatt, 17 for 17:00). Husk at denne tiden forholder seg til serverens tid, og kan avvike fra din systemklokke.
      Den omtrentlige servertiden er:
      Det neste daglige sammendraget er planlagt utsendt ", "notifications.remove-images": "Remove images from email notifications", - "require-email-address": "Require new users to specify an email address", - "require-email-address-warning": "By default, users can opt-out of entering an email address by leaving the field blank. Enabling this option means they have to enter an email address in order to proceed with registration. It does not ensure user will enter a real email address, nor even an address they own.", - "send-validation-email": "Send validation emails when an email is added or changed", - "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", - "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws.", + "require-email-address": "Krev at nye brukere legger til en e-postadresse", + "require-email-address-warning": "Som standard, kan brukere velge bort å fylle ut e-postadresse ved å la feltet stå tomt. Å skru på dette valget innebærer at de må legge inn en e-postadresse for å kunne fortsette registreringen. Dette sikrer ikke at brukeren vil legge inn en gyldig e-postadresse, heller ikke en e-postadresse de eier.", + "send-validation-email": "Send bekreftelses-e-post når en e-post legges til eller endres", + "include-unverified-emails": "Send e-post til mottakere som ikke eksplisitt har bekreftet e-postadressen sin.", + "include-unverified-warning": "Som standard, vil brukere som har e-postadresse knyttet til deres konto allerede være verifisert, men det er noen situasjoner hvor dette ikke er tilfelle (f.eks. SSO-innlogginger, grandfathered users, etc). Skru på denne innstillingen på egen risiko – å sende e-poster til uverifiserte e-postadresser kan være brudd på regionale anti-spam-regler.", "prompt": "Prompt users to enter or confirm their emails", - "prompt-help": "If a user does not have an email set, or their email is not confirmed, a warning will be shown on screen.", - "sendEmailToBanned": "Send emails to users even if they have been banned" + "prompt-help": "Hvis en bruker mangler e-postadresse, eller e-postadressen ikke er bekreftet, vil en advarsel vises på skjermen. ", + "sendEmailToBanned": "Send e-post til brukere selv om de har blitt utestengt" } diff --git a/public/language/nb/admin/settings/languages.json b/public/language/nb/admin/settings/languages.json index bdd57849b3..812345597c 100644 --- a/public/language/nb/admin/settings/languages.json +++ b/public/language/nb/admin/settings/languages.json @@ -1,6 +1,6 @@ { "language-settings": "Language Settings", - "description": "The default language determines the language settings for all users who are visiting your forum.
      Individual users can override the default language on their account settings page.", + "description": "Det prevalgte språket avgjør språkinnstillingene for alle brukere som besøker forumet ditt.
      Indiviuelle brukere kan overstyre det prevalgte språket inne på deres kontoinnstillinger.", "default-language": "Default Language", "auto-detect": "Auto Detect Language Setting for Guests" } \ No newline at end of file diff --git a/public/language/nb/admin/settings/reputation.json b/public/language/nb/admin/settings/reputation.json index 59cf488dea..ddf6fd0f44 100644 --- a/public/language/nb/admin/settings/reputation.json +++ b/public/language/nb/admin/settings/reputation.json @@ -12,7 +12,7 @@ "downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)", "min-rep-chat": "Minimum reputation to send chat messages", "min-rep-flag": "Minimum omdømme for å flagge innlegg", - "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-website": "Minimum omdømme som kreves for å legge \"Nettsted\" til brukerprofil", "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile", "min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile", diff --git a/public/language/nb/admin/settings/user.json b/public/language/nb/admin/settings/user.json index ae8826bb7f..7998884043 100644 --- a/public/language/nb/admin/settings/user.json +++ b/public/language/nb/admin/settings/user.json @@ -13,7 +13,7 @@ "disable-password-changes": "Deaktiver endringer for passord", "allow-account-deletion": "Tillat kontosletting ", "hide-fullname": "Skjul fullt navn for andre brukere", - "hide-email": "Skjul e-post for brukere", + "hide-email": "Skjul e-post for andre brukere", "show-fullname-as-displayname": "Vis brukerens fulle navn som navn ved visning hvis tilgjengelig", "themes": "Temaer", "disable-user-skins": "Forhindre brukere fra å velge en tilpasset skin", @@ -72,7 +72,7 @@ "digest-freq.biweekly": "Annenhver uke", "digest-freq.monthly": "Månedlig ", "email-chat-notifs": "Send en e-post hvis jeg mottar en ny chatt-melding om jeg ikke er online. ", - "email-post-notif": "Send en e-post når det kommer svar på tråder jeg abbonnerer på", + "email-post-notif": "Send en e-post når det kommer svar på tråder jeg abonnerer på", "follow-created-topics": "Følg tråder du lager", "follow-replied-topics": "Følg tråder du svarer på", "default-notification-settings": "Standard varslingsinnstillinger", diff --git a/public/language/nb/email.json b/public/language/nb/email.json index 46ffe70a84..e36f798865 100644 --- a/public/language/nb/email.json +++ b/public/language/nb/email.json @@ -8,7 +8,7 @@ "email.verify-your-email.subject": "Bekreft e-postadressen din ", "email.verify.text1": "Du har bedt oss om å endre eller bekrefte e-postadressen din", "email.verify.text2": "Av sikkerhetshensyn endrer eller bekrefter vi bare e-postadressen som er registrert når eierskapet er bekreftet via e-post. Hvis du ikke har bedt om dette, er det ikke nødvendig å gjøre noe fra din side.", - "email.verify.text3": "Når du bekrefter denne e-postadressen, skifter vi ut din nåværende e-postadresse med denne (%1). ", + "email.verify.text3": "Når du bekrefter denne e-postadressen, bytter vi ut din nåværende e-postadresse med denne (%1). ", "welcome.text1": "Takk for at du registrerte deg hos %1!", "welcome.text2": "For å aktivere kontoen din må vi verifisere at du eier e-postadressen du registrerte deg med.", "welcome.text3": "En administrator har akseptert din søknad om registering. Du kan nå logge inn med ditt brukernavn og passord.", @@ -43,13 +43,13 @@ "notif.cta-new-reply": "Vis post", "notif.cta-new-chat": "Vis chatt", "notif.test.short": "Testing av varsler ", - "notif.test.long": "Dette er en test av e-postmeldingen. Send hjelp!", + "notif.test.long": "Dette er en test av e-postmeldingen for varsler. Send hjelp!", "test.text1": "Dette er en test e-post for å verifisere at e-postsystemet i NodeBB fungerer som det skal.", "unsub.cta": "Klikk her for å endre disse innstillingene", "unsubscribe": "Avfølg", "unsub.success": "Du vil ikke lenger motta e-poster fra %1 utsendelseslisten ", - "unsub.failure.title": "kan ikke avslutte abonnementet", - "unsub.failure.message": "Dessverre kunne vi ikke melde deg av e-postlisten, da det var et problem med lenke. Du kan imidlertid endre preferansene for e-post ved å gå tilinnstillinger.

      (error:1%):", + "unsub.failure.title": "Kan ikke avslutte abonnementet", + "unsub.failure.message": "Dessverre kunne vi ikke melde deg av e-postlisten, da det var et problem med lenken. Du kan imidlertid endre preferansene for e-post ved å gå tilinnstillinger.

      (feil:1%):", "banned.subject": "Du har blitt utestengt fra %1", "banned.text1": "Brukeren %1 er utestengt fra %2.", "banned.text2": "Dette forbudet varer til %1.", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 450515b027..5a56fc2e75 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -35,11 +35,11 @@ "email-taken": "E-post opptatt", "email-nochange": "E-posten som er angitt er den samme e-posten som allerede er lagret.", "email-invited": "E-post har allerede fått invitasjon", - "email-not-confirmed": "Posting i enkelte kategorier eller emner er aktivert når e-posten din er bekreftet. Klikk her for å sende en bekreftelses-e-post. ", + "email-not-confirmed": "Posting i enkelte kategorier eller emner blir aktivert når e-posten din er bekreftet. Klikk her for å sende en bekreftelses-e-post. ", "email-not-confirmed-chat": "Du kan ikke chatte før e-posten din er bekreftet, vennligst klikk her for å bekrefte e-postadressen.", "email-not-confirmed-email-sent": "E-posten din er ikke bekreftet ennå, sjekk innboksen din for bekreftelses-e-post. Det kan hende du ikke kan legge ut innlegg i enkelte kategorier eller chatte før e-posten din er bekreftet.", - "no-email-to-confirm": "Kontoen din har ikke et e-postsett. En e-post er nødvendig for gjenoppretting av konto, og kan være nødvendig for chatting og innlegg i enkelte kategorier. Klikk her for å skrive inn en e-post.", - "user-doesnt-have-email": "Brukeren «%1» har ikke angitt en e-post. ", + "no-email-to-confirm": "Kontoen din mangler e-postadresse. En e-postadresse er nødvendig for gjenoppretting av konto, og kan være nødvendig for chatting og innlegg i enkelte kategorier. Klikk her for å skrive inn en e-postadresse.", + "user-doesnt-have-email": "Brukeren «%1» har ikke lagt til e-postadresse. ", "email-confirm-failed": "Vi kunne ikke bekrefte e-posten din, vennligst prøv igjen senere.", "confirm-email-already-sent": "E-post for bekreftelse er allerede sendt, vennligst vent %1 minutt(er) for å sende en til.", "sendmail-not-found": "Funksjonaliteten \"sendmail\" ble ikke funnet, vennligst sjekk at den er installert og kjørbar av brukeren som kjører NodeBB.", @@ -53,7 +53,7 @@ "user-banned-reason": "Beklager, denne kontoen har blitt utestengt (Grunn: %1)", "user-banned-reason-until": "Beklager, denne kontoen har blit utestengt til %1 (Grunn: %2)", "user-too-new": "Beklager, du må vente %1 sekund(er) før du oppretter ditt første innlegg", - "blacklisted-ip": "Beklager, din IP-adresse har blitt utestengt fra dette forumet. Hvis du føler dette er en feil, vennligst kontakt en sideadministrator.", + "blacklisted-ip": "Beklager, din IP-adresse har blitt utestengt fra dette forumet. Hvis du mener dette er en feil, vennligst kontakt en sideadministrator.", "ban-expiry-missing": "Vennligst oppgi et sluttidspunkt for denne utestengingen.", "no-category": "Kategorien eksisterer ikke", "no-topic": "Emne eksisterer ikke", @@ -87,7 +87,7 @@ "title-too-long": "Vennligst skriv en kortere tittel. Tittel kan ikke være lengre enn %1 tegn.", "category-not-selected": "Kategori ikke valgt", "too-many-posts": "Du kan bare poste en gang per %1 sekund(er) – vennligst vent før du poster igjen", - "too-many-posts-newbie": "Som ny bruker kan du bare poste en gang per %1. sekund(er), før du har opparbeidet %2 i rykte – vennligst vent før du poster igjen", + "too-many-posts-newbie": "Som ny bruker kan du bare poste en gang per %1. sekund(er), før du har opparbeidet %2 i omdømme – vennligst vent før du poster igjen", "tag-too-short": "Vennligst skriv et lengre emneord. Disse må være på minst %1 tegn", "tag-too-long": "Vennligst skriv et kortere emneord. Disse kan ikke være lengre enn %1 tegn", "not-enough-tags": "Ikke nok emneord. Emner må ha minst %1.", @@ -108,9 +108,9 @@ "already-bookmarked": "Du har allerede bokmerket dette innlegget", "already-unbookmarked": "Du har allerede fjernet bokmerket fra dette innlegget", "cant-ban-other-admins": "Du kan ikke utestenge andre administratorer!", - "cant-mute-other-admins": "Du kan ikke kneble andre administratorer. ", - "user-muted-for-hours": "Du har blitt kneblet, du vil være i stand til å skrive innlegg innen %1 time(r). ", - "user-muted-for-minutes": "Du har blitt kneblet, du vil være i stand til å skrive innlegg innen %1 minutt(er).", + "cant-mute-other-admins": "Du kan ikke kneble andre administratorer.", + "user-muted-for-hours": "Du har blitt kneblet, du vil være i stand til å skrive innlegg om %1 time(r). ", + "user-muted-for-minutes": "Du har blitt kneblet, du vil være i stand til å skrive innlegg om %1 minutt(er).", "cant-make-banned-users-admin": "Du kan ikke gjøre utestengte brukere til administrator. ", "cant-remove-last-admin": "Du er den eneste administratoren. Legg til en annen bruker som administrator før du fjerner deg selv.", "account-deletion-disabled": "Kontosletting er deaktivert", @@ -156,7 +156,7 @@ "chat-restored-already": "Denne meldingen har allerede blitt gjenopprettet.", "chat-room-does-not-exist": "Dette chatterommet finnes ikke.", "already-voting-for-this-post": "Du har allerede stemt på dette innlegget", - "reputation-system-disabled": "Ryktesystemet er deaktivert.", + "reputation-system-disabled": "Omdømmesystemet er deaktivert.", "downvoting-disabled": "Nedstemming er deaktivert", "not-enough-reputation-to-chat": "You need %1 reputation to chat", "not-enough-reputation-to-upvote": "Du trenger %1 omdømme for å stemme opp. ", @@ -182,7 +182,7 @@ "parse-error": "Noe gikk feil under analysering av serversvar", "wrong-login-type-email": "Vennligst benytt e-posten din for å logge inn", "wrong-login-type-username": "Vennligst benytt brukernavnet ditt for å logge inn", - "sso-registration-disabled": "Registrering har blitt deaktivert for %1 konto(er), vennligst registrer deg med en e-post adresse først", + "sso-registration-disabled": "Registrering har blitt deaktivert for %1 konto(er), registrer deg med en e-post adresse først", "sso-multiple-association": "Du kan ikke knytte flere kontoer til din NodeBB konto. Vennligst koble fra din eksisterende konto og prøv igjen.", "invite-maximum-met": "Du har invitert maks antall personer (%1 av %2).", "no-session-found": "Ingen innlogget sesjon funnet!", diff --git a/public/language/nb/global.json b/public/language/nb/global.json index 9c8254dc1d..4ea9222a50 100644 --- a/public/language/nb/global.json +++ b/public/language/nb/global.json @@ -47,7 +47,7 @@ "alert.error": "Feil", "alert.banned": "Utestengt", "alert.banned.message": "Du har nettop blitt utestengt, din tilgang er nå begrenset.", - "alert.unbanned": "Ikke utestengt", + "alert.unbanned": "Utestengelse opphevet", "alert.unbanned.message": "Utestengelsen er opphevet", "alert.unfollow": "Du følger ikke lenger %1!", "alert.follow": "Du følger nå %1!", @@ -66,7 +66,7 @@ "downvoted": "Nedstemte ", "views": "Visninger", "posters": "Innlegg ", - "reputation": "Rykte", + "reputation": "Omdømme", "lastpost": "Seneste innlegg", "firstpost": "Første innlegg ", "read_more": "les mer", @@ -87,11 +87,11 @@ "recentposts": "Seneste innlegg", "recentips": "Seneste innloggede IPer", "moderator_tools": "Moderatorverktøy", - "online": "Pålogget", + "online": "Tilkoblet", "away": "Borte", "dnd": "Ikke forstyrr", "invisible": "Usynlig", - "offline": "Avlogget", + "offline": "Frakoblet", "email": "E-post", "language": "Språk", "guest": "Gjest", diff --git a/public/language/nb/login.json b/public/language/nb/login.json index 597b4ad124..fc6eb92fc8 100644 --- a/public/language/nb/login.json +++ b/public/language/nb/login.json @@ -4,7 +4,7 @@ "remember_me": "Husk meg?", "forgot_password": "Glemt passord?", "alternative_logins": "Alternativ innlogging", - "failed_login_attempt": "Innlogging misslyktes", + "failed_login_attempt": "Innlogging mislyktes", "login_successful": "Du har blitt logget inn!", "dont_have_account": "Har du ikke en konto?", "logged-out-due-to-inactivity": "Du har blitt logget ut av administratorsidene fordi du har vært inaktiv for lenge", diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index 8087f11a98..9ae49a8f93 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -53,8 +53,8 @@ "post-queue-notify": "Varsel mottatt for innlegg i kø:
      \"%1\"", "email-confirmed": "E-post bekreftet", "email-confirmed-message": "Takk for at du har validert din e-post. Kontoen din er nå fullstendig aktivert.", - "email-confirm-error-message": "Det oppsto et problem under valdiering av din e-post. Koden kan ha vært ugyldig eller ha utløpt.", - "email-confirm-sent": "Bekreftelsesepost sendt.", + "email-confirm-error-message": "Det oppsto et problem under validering av e-posten din. Koden kan ha vært ugyldig eller ha utløpt.", + "email-confirm-sent": "Bekreftelses-e-post sendt.", "none": "Ingen", "notification_only": "Kun notifikasjon ", "email_only": "Kun e-post", diff --git a/public/language/nb/pages.json b/public/language/nb/pages.json index a9bad8f617..e44c00e42d 100644 --- a/public/language/nb/pages.json +++ b/public/language/nb/pages.json @@ -17,7 +17,7 @@ "users/online": "Påloggede Brukere", "users/latest": "Nyeste Brukere", "users/sort-posts": "Brukere med flest innlegg", - "users/sort-reputation": "Brukere med best rykte", + "users/sort-reputation": "Brukere med best omdømme", "users/banned": "Utestengte brukere", "users/most-flags": "Brukere som er mest flagget ", "users/search": "Brukersøk", diff --git a/public/language/nb/register.json b/public/language/nb/register.json index 43cece6dea..55ed85a0e9 100644 --- a/public/language/nb/register.json +++ b/public/language/nb/register.json @@ -25,7 +25,7 @@ "interstitial.errors-found": "Vennligst gå igjennom oppgitt informasjon:", "gdpr_agree_data": "Jeg samtykker til innsamling og behandling av min personlige informasjon på dette nettstedet.", "gdpr_agree_email": "Jeg samtykker i å motta forumsammendrag og varsler på e-postmeldinger fra dette nettstedet. ", - "gdpr_consent_denied": "Du må gi samtykke til at dette nettstedet kan samle inn / behandle informasjonen din, og til å sende deg e-post. ", + "gdpr_consent_denied": "Du må gi samtykke til at dette nettstedet kan samle inn/behandle informasjonen din, og sende deg e-post.", "invite.error-admin-only": "Direkte brukerregistrering er deaktivert. Kontakt en administrator for mer informasjon. ", "invite.error-invite-only": "Direkte brukerregistrering er deaktivert. Du må bli invitert av en eksisterende bruker for å få tilgang til dette forumet. ", "invite.error-invalid-data": "Registrerte data som mottas samsvarer ikke med registrene våre. Kontakt en administrator for mer informasjon." diff --git a/public/language/nb/user.json b/public/language/nb/user.json index 5c3e8867d7..4a2782610f 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -1,13 +1,13 @@ { "banned": "Utestengt", "muted": "Muted", - "offline": "Offline", + "offline": "Frakoblet", "deleted": "Slettet", "username": "Brukernavn", "joindate": "Registereringsdato", "postcount": "Antall innlegg", "email": "E-post", - "confirm_email": "Bekfreft e-post", + "confirm_email": "Bekreft e-post", "account_info": "Kontoinformasjon", "admin_actions_label": "Administrative handlinger ", "ban_account": "Utesteng kont", @@ -30,7 +30,7 @@ "location": "Plassering", "age": "Alder", "joined": "Ble med", - "lastonline": "Senest online", + "lastonline": "Sist tilkoblet", "profile": "Profil", "profile_views": "Profilvisninger", "reputation": "Omdømme", @@ -60,7 +60,7 @@ "change_picture": "Bytt bilde", "change_username": "Endre brukernavn", "change_email": "Endre e-post", - "email_same_as_password": "Vennligst skriv inn ditt nåværende passord for å fortsette & ndash; du har skrevet inn den nye e-posten din igjen", + "email_same_as_password": "Skriv inn ditt nåværende passord for å fortsette – du har skrevet inn den nye e-posten din igjen", "edit": "Endre", "edit-profile": "Rediger profil", "default_picture": "Standardikonet", @@ -76,8 +76,8 @@ "change_password_success": "Passordet ditt ble oppdatert!", "confirm_password": "Bekreft passord", "password": "Passord", - "username_taken_workaround": "Brukernavnet du ønsket er opptatt, så vi har endret ditt litt. Du er nå kjent som %1", - "password_same_as_username": "Ditt passord er det samme som ditt brukernavn, vennligst velg et annet passord.", + "username_taken_workaround": "Brukernavnet du ønsket er opptatt, så vi har endret det litt. Du er nå kjent som %1", + "password_same_as_username": "Passordet ditt er det samme som brukernavnet ditt. Velg et annet passord.", "password_same_as_email": "Passordet ditt er det samme som e-postadressen din. Velg et annet passord.", "weak_password": "Svakt passord", "upload_picture": "Last opp bilde", @@ -163,26 +163,26 @@ "info.muted-expiry": "Expiry", "info.muted-no-reason": "Ingen grunn oppgitt.", "info.username-history": "Brukernavnhistorikk", - "info.email-history": "E-post historikk", + "info.email-history": "E-post-historikk", "info.moderation-note": "Moderasjonsnotat ", "info.moderation-note.success": "Moderasjonsnotat ikke lagret ", "info.moderation-note.add": "Legg til notat", "sessions.description": "Denne siden lar deg se alle aktivitetsøkter på dette forumet og tilbakekalle dem om nødvendig. Du kan tilbakekalle din egen økt ved å logge av brukerkontoen din.", "consent.title": "Dine rettigheter & amp; Samtykke", "consent.lead": "Dette forumet samler inn og behandler dine personopplysninger. ", - "consent.intro": "Vi bruker denne informasjonen for å tilpasse brukeropplevelsen din i dette nettforumet, samt for å knytte innleggene du lager til brukerkontoen din. Under registreringstrinnet i Felles brukerhåndtering ble du bedt om å oppgi fullt navn og en e-postadresse. Du kan også velge å oppgi tilleggsinformasjon for å fullføre brukerprofilen din på dette nettstedet.

      Vi oppbevarer denne informasjonen i løpet av den tiden du er aktivt på brukerkontoen din, og du kan når som helst trekke tilbake samtykke ved å slette kontoen din. Du kan når som helst be om en kopi av ditt bidrag til dette nettstedet, via dine rettigheter & amp; Samtykke side.

      Hvis du har spørsmål eller spørsmål, oppfordrer vi deg til å ta kontakt med dette forumets administrative team.", - "consent.email_intro": "Vi kan fra tid til annen sende deg en e-post til din registrerte e-postadresse for å varsle deg om oppdateringer og/eller informere deg om ny aktivitet som er relevant for deg. Du kan endre hvor ofte vi sender forumsammendrag (eller du kan slå det helt av), og endre hvilke typer oppdateringer du vil motta via brukerinnstillingene dine. Med mindre du har endret dette i brukerinnstillingene, sender ikke dette forumet ut sammendrag via e-post.", - "consent.digest_frequency": "Med mindre dette er eksplisitt endret i brukerinnstillingene dine, leverer dette fellesskapet e-postkoder hver %1.", - "consent.digest_off": "Med mindre dette er eksplisitt endret i brukerinnstillingene dine, sender ikke dette fellesskapet ut e-postkoder", + "consent.intro": "Vi bruker kun denne informasjonen for å tilpasse brukeropplevelsen din i dette nettforumet, og for å knytte innleggene du lager til brukerkontoen din. Under registreringstrinnet i Felles brukerhåndtering ble du bedt om å oppgi fullt navn og en e-postadresse. Du kan også velge å oppgi tilleggsinformasjon for å fullføre brukerprofilen din på dette nettstedet.

      Vi oppbevarer denne informasjonen så lenge brukerprofilen din er aktiv, og du kan når som helst trekke tilbake samtykke ved å slette kontoen din. Du kan når som helst be om en kopi av ditt bidrag til dette nettstedet, via dine rettigheter & Samtykkeside.

      Hvis du har spørsmål eller bekymringer, oppfordrer vi deg til å ta kontakt med forumets administrative team.", + "consent.email_intro": "Vi kan fra tid til annen sende deg en e-post til din registrerte e-postadresse for å varsle deg om oppdateringer og/eller informere deg om ny aktivitet som er relevant for deg. Du kan endre hvor ofte vi sender forumsammendrag (eller du kan slå det helt av), og endre hvilke typer oppdateringer du vil motta via brukerinnstillingene dine.", + "consent.digest_frequency": "Med mindre dette er eksplisitt endret i brukerinnstillingene dine, leverer dette fellesskapet e-postsammendrag hver %1.", + "consent.digest_off": "Med mindre dette er eksplisitt endret i brukerinnstillingene dine, sender ikke dette fellesskapet ut e-postsammendrag", "consent.received": "Du har gitt samtykke til at dette nettstedet samler inn og behandler informasjonen din. Ingen ytterligere tiltak er nødvendig.", - "consent.not_received": "Du har ikke gitt samtykke til datainnsamling og behandling. Når som helst kan derfor nettsidens administrasjon velge å slette kontoen din for å bli kompatibel med personvernforordningen. ", + "consent.not_received": "Du har ikke gitt samtykke til datainnsamling og behandling. Nettsidens administrasjon kan derfor velge å slette kontoen din når som helst, for å bli kompatibel med personvernforordningen. ", "consent.give": "Gi samtykke", "consent.right_of_access": "Du har rett til innsyn", "consent.right_of_access_description": "På forespørsel har du har rett til å få tilgang til data som samles inn av dette nettstedet. Du kan hente en kopi av disse dataene ved å klikke på riktig knapp nedenfor.", "consent.right_to_rectification": "Du har rett til å få rettet uriktige data ", "consent.right_to_rectification_description": "Du har rett til å endre eller oppdatere uriktige data som er gitt til oss. Brukerprofilen din kan oppdateres ved å redigere profilen din, og innhold på innlegg kan alltid redigeres. Hvis dette ikke er tilfelle, kan du kontakte dette nettstedets administrasjonsteam.", "consent.right_to_erasure": "Du har rett til sletting", - "consent.right_to_erasure_description": "Når som helst kan du tilbakekalle ditt samtykke til datainnsamling og / eller behandling ved å slette brukerkontoen din. Den individuelle profilen din kan slettes, selv om de publiserte innleggene dine blir værende igjen. Hvis du vil slette begge kontoer og alt innhold, vennligst kontakt administrasjonsteamet for dette nettstedet. ", + "consent.right_to_erasure_description": "Du kan når som helst tilbakekalle ditt samtykke til datainnsamling og/eller behandling ved å slette brukerkontoen din. Den individuelle profilen din kan slettes, selv om de publiserte innleggene dine blir værende igjen. Hvis du vil slette begge kontoer og alt innhold, kontakt administrasjonsteamet for dette nettstedet. ", "consent.right_to_data_portability": "Du har retten til dataportabilitet", "consent.right_to_data_portability_description": "Du kan be oss om maskinlesbar eksport av innsamlede data om deg og brukerkontoen din. Du kan gjøre det ved å klikke på riktig knapp nedenfor.", "consent.export_profile": "Eksporter profil (.json)", @@ -191,9 +191,9 @@ "consent.export-uploads-success": "Når du eksporterer opplastinger, får du et varsel når det er fullført.", "consent.export_posts": "Eksporter innlegg (.csv)", "consent.export-posts-success": "Eksporterer innlegg, du får en notifikasjon når eksporten er fullført.", - "emailUpdate.intro": "Vennligst skriv inn e-postadressen din nedenfor. Dette forumet bruker e-postadressen din for å planlegge sammendrag og varsler, samt for gjenoppretting av konto i tilfelle tapt passord.", - "emailUpdate.optional": "Dette feltet e valgfritt. Du er ikke forpliktet til å oppgi e-postadressen din, men uten en validert e-post vil du ikke kunne gjenopprette kontoen din eller logge på med e-posten din.", + "emailUpdate.intro": "Skriv inn e-postadressen din nedenfor. Dette forumet bruker e-postadressen din til planlagte sammendrag og varsler, og for gjenoppretting av konto ved glemt passord.", + "emailUpdate.optional": "Dette feltet er valgfritt. Du er ikke forpliktet til å oppgi e-postadressen din, men uten en validert e-postadresse vil du ikke kunne gjenopprette kontoen din eller logge på med e-postadressen din.", "emailUpdate.required": "Dette feltet er obligatorisk", - "emailUpdate.change-instructions": "En bekreftelses-e-post vil bli sendt til den angitte e-postadressen med en unik lenke. Å få tilgang til den koblingen vil bekrefte at du eier e-postadressen, og den blir aktiv på kontoen din. Du kan når som helst oppdatere e-posten din fra siden til kontoen din.", + "emailUpdate.change-instructions": "En bekreftelses-e-post med en unik lenke vil bli sendt til den angitte e-postadressen. Ved å klikke på lenken, vil du bekrefte at du eier e-postadressen, og den blir aktiv på kontoen din. Du kan når som helst oppdatere e-postadressen på brukerprofilen din.", "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership." } \ No newline at end of file diff --git a/public/language/nb/users.json b/public/language/nb/users.json index d5365477cc..354aade01b 100644 --- a/public/language/nb/users.json +++ b/public/language/nb/users.json @@ -13,7 +13,7 @@ "invite": "Invitér", "prompt-email": "E-poster:", "groups-to-join": "Grupper som en kan bli med i når invitasjonen godtas:", - "invitation-email-sent": "En invitasjons-epost ble sendt til %1", + "invitation-email-sent": "En invitasjons-e-post ble sendt til %1", "user_list": "Brukerliste", "recent_topics": "Seneste tråder", "popular_topics": "Populære tråder", From 95a5d516cbecba53526233e49b13d82959c962fe Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Thu, 27 Oct 2022 09:06:14 +0000 Subject: [PATCH 098/150] Latest translations and fallbacks --- public/language/nb/users.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/nb/users.json b/public/language/nb/users.json index 354aade01b..b1aac09034 100644 --- a/public/language/nb/users.json +++ b/public/language/nb/users.json @@ -9,7 +9,7 @@ "load_more": "Last flere", "users-found-search-took": "%1 bruker(e) funnet. Søket tok %2 sekunder.", "filter-by": "Filtrer etter", - "online-only": "Bare påloggede", + "online-only": "Kun tilkoblede", "invite": "Invitér", "prompt-email": "E-poster:", "groups-to-join": "Grupper som en kan bli med i når invitasjonen godtas:", From b86eb03a4c65728e9cb9019d237942302134a474 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sat, 29 Oct 2022 09:05:57 +0000 Subject: [PATCH 099/150] Latest translations and fallbacks --- public/language/de/admin/menu.json | 2 +- public/language/de/admin/settings/email.json | 4 ++-- public/language/de/admin/settings/post.json | 2 +- public/language/de/admin/settings/reputation.json | 8 ++++---- public/language/de/admin/settings/user.json | 2 +- public/language/de/error.json | 4 ++-- public/language/de/modules.json | 2 +- public/language/de/user.json | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/public/language/de/admin/menu.json b/public/language/de/admin/menu.json index 07a3c5937b..be0255aeeb 100644 --- a/public/language/de/admin/menu.json +++ b/public/language/de/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Abmelden", "view-forum": "Forum anzeigen", - "search.placeholder": "Search settings", + "search.placeholder": "Nach Einstellungen suchen", "search.no-results": "Keine Ergebnisse...", "search.search-forum": "Suche im Forum nach ", "search.keep-typing": "Gib mehr ein, um die Ergebnisse zu sehen...", diff --git a/public/language/de/admin/settings/email.json b/public/language/de/admin/settings/email.json index 1444ca221c..db1e0d1de4 100644 --- a/public/language/de/admin/settings/email.json +++ b/public/language/de/admin/settings/email.json @@ -5,8 +5,8 @@ "from": "Name des Absenders", "from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.", - "confirmation-settings": "Confirmation", - "confirmation.expiry": "Hours to keep email confirmation link valid", + "confirmation-settings": "Konfirmation", + "confirmation.expiry": "Stunden, um den E-Mail-Bestätigungslink gültig zu halten", "smtp-transport": "SMTP Konfiguration", "smtp-transport.enabled": "SMTP-Transport aktivieren", diff --git a/public/language/de/admin/settings/post.json b/public/language/de/admin/settings/post.json index 33d1885e40..74e262d7ec 100644 --- a/public/language/de/admin/settings/post.json +++ b/public/language/de/admin/settings/post.json @@ -51,7 +51,7 @@ "signature.disable": "Signaturen deaktivieren", "signature.no-links": "Links in signaturen deaktivieren", "signature.no-images": "Bilder in Signaturen deaktivieren", - "signature.hide-duplicates": "Hide duplicate signatures in topics", + "signature.hide-duplicates": "Doppelte Signaturen in Themen ausblenden", "signature.max-length": "Maximale Signaturlänge", "composer": "Editor Einstellungen", "composer-help": "Die folgenden Einstellungen bestimmen die funktionalität und/oder das Aussehen des Beitragseditors, der Nutzern angezeigt wird, webb sie neue Themen erstellen, oder bereits existierenden Antworten.", diff --git a/public/language/de/admin/settings/reputation.json b/public/language/de/admin/settings/reputation.json index d7b7585c7b..ffb9f2effc 100644 --- a/public/language/de/admin/settings/reputation.json +++ b/public/language/de/admin/settings/reputation.json @@ -24,8 +24,8 @@ "flags.limit-per-target-help": "Wenn ein Beitrag oder ein Benutzer mehrfach markiert wird, wird jede zusätzliche Markierung als "Nachricht" betrachtet und zur ursprünglichen Markierung hinzugezählt. Setzen Sie diese Option auf eine andere Zahl als Null, um die Anzahl der Nachricht, die ein Artikel erhalten kann, zu begrenzen.", "flags.auto-flag-on-downvote-threshold": "Anzahl der Downvotes für Posts mit automatischer Markierung (zum Deaktivieren auf 0 setzen, Standard: 0)", "flags.auto-resolve-on-ban": "Automatisches Beenden aller Tickets eines Benutzers, wenn dieser gesperrt wird", - "flags.action-on-resolve": "Do the following when a flag is resolved", - "flags.action-on-reject": "Do the following when a flag is rejected", - "flags.action.nothing": "Do nothing", - "flags.action.rescind": "Rescind the notification send to moderators/administrators" + "flags.action-on-resolve": "Führe Folgendes aus, wenn eine Flagge aufgelöst wird", + "flags.action-on-reject": "Gehe folgendermaßen vor, wenn eine Flagge abgelehnt wird", + "flags.action.nothing": "Nichts tun", + "flags.action.rescind": "Aufhebung der Benachrichtigung an Moderatoren/Administratoren" } \ No newline at end of file diff --git a/public/language/de/admin/settings/user.json b/public/language/de/admin/settings/user.json index 70dcbf5a0f..2af71b2cc6 100644 --- a/public/language/de/admin/settings/user.json +++ b/public/language/de/admin/settings/user.json @@ -1,7 +1,7 @@ { "authentication": "Authentifizierung", "email-confirm-interval": "Der Benutzer kann für ", - "email-confirm-interval2": "minutes have elapsed", + "email-confirm-interval2": "Minuten sind verstrichen", "allow-login-with": "Erlaube Login mit", "allow-login-with.username-email": "Benutzername oder E-Mail", "allow-login-with.username": "Nur Benutzername", diff --git a/public/language/de/error.json b/public/language/de/error.json index 6767540d5f..bd3dd4083d 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -205,8 +205,8 @@ "no-connection": "Es scheint als gäbe es ein Problem mit deiner Internetverbindung", "socket-reconnect-failed": "Der Server kann zurzeit nicht erreicht werden. Klicken Sie hier, um es erneut zu versuchen, oder versuchen Sie es später erneut", "plugin-not-whitelisted": "Plugin kann nicht installiert werden – nur Plugins, die vom NodeBB Package Manager in die Whitelist aufgenommen wurden, können über den ACP installiert werden", - "plugins-set-in-configuration": "You are not allowed to change plugin state as they are defined at runtime (config.json, environmental variables or terminal arguments), please modify the configuration instead.", - "theme-not-set-in-configuration": "When defining active plugins in configuration, changing themes requires adding the new theme to the list of active plugins before updating it in the ACP", + "plugins-set-in-configuration": "Du darfst den Status der Plugins nicht ändern, da sie zur Laufzeit definiert werden (config.json, Umgebungsvariablen oder Terminalargumente). Bitte ändere stattdessen die Konfiguration.", + "theme-not-set-in-configuration": "Wenn in der Konfiguration aktive Plugins definiert werden, muss bei einem Themenwechsel das neue Thema zur Liste der aktiven Plugins hinzugefügt werden, bevor es im ACP aktualisiert wird.", "topic-event-unrecognized": "Themenereignis „%1“ nicht erkannt", "cant-set-child-as-parent": "Untergeordnete Kategorie kann nicht als übergeordnete Kategorie festgelegt werden", "cant-set-self-as-parent": "Die aktuelle Kategorie kann nicht als übergeordnete Kategorie festgelegt werden", diff --git a/public/language/de/modules.json b/public/language/de/modules.json index b35ecf2a57..f5ba9f93d7 100644 --- a/public/language/de/modules.json +++ b/public/language/de/modules.json @@ -1,5 +1,5 @@ { - "chat.chatting_with": "Chat mit", + "chat.chatting_with": "Chatte mit", "chat.placeholder": "Gebe hier eine Chatnachricht ein, ziehe Bilder per Drag & Drop und drücke die Eingabetaste, um sie zu senden", "chat.scroll-up-alert": "Diese Nachrichten sind möglicherweise veraltet, klicke hier um neuere Nachrichten anzuzeigen.", "chat.send": "Senden", diff --git a/public/language/de/user.json b/public/language/de/user.json index e208e413bf..ae3f62dd99 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -195,5 +195,5 @@ "emailUpdate.optional": "Dieses Feld ist optional. Du bist nicht verpflichtet, deine E-Mail-Adresse anzugeben, doch ohne eine validierte E-Mail-Adresse kannst du dein Konto nicht wiederherstellen oder dich mit deiner E-Mail-Adresse anmelden.", "emailUpdate.required": "Dieses Feld ist erforderlich.", "emailUpdate.change-instructions": "An die eingegebene E-Mail-Adresse wird eine Bestätigungs-E-Mail mit einem eindeutigen Link gesendet. Durch den Zugriff auf diesen Link wird dein Eigentum an der E-Mail-Adresse bestätigt und diese wird in deinem Konto aktiv. Du kannst deine E-Mail-Adresse jederzeit auf deiner Kontoseite aktualisieren.", - "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership." + "emailUpdate.password-challenge": "Bitte gib dein Passwort ein, um dein Konto zu verifizieren." } \ No newline at end of file From a6e4fee1374184f5bd10acc36e8c89b2cdf3d0dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:41:00 -0500 Subject: [PATCH 100/150] chore(deps): update dependency jsdom to v20.0.2 (#11014) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 1b8e300584..126d836ecf 100644 --- a/install/package.json +++ b/install/package.json @@ -158,7 +158,7 @@ "grunt": "1.5.3", "grunt-contrib-watch": "1.1.0", "husky": "8.0.1", - "jsdom": "20.0.1", + "jsdom": "20.0.2", "lint-staged": "13.0.3", "mocha": "10.1.0", "mocha-lcov-reporter": "1.3.0", From 73a608549d169c80488a9b2d9ccf6466d8ccf853 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:41:58 -0500 Subject: [PATCH 101/150] fix(deps): update dependency sanitize-html to v2.7.3 (#11008) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 126d836ecf..14d3552206 100644 --- a/install/package.json +++ b/install/package.json @@ -119,7 +119,7 @@ "request-promise-native": "1.0.9", "rimraf": "3.0.2", "rss": "1.2.2", - "sanitize-html": "2.7.2", + "sanitize-html": "2.7.3", "semver": "7.3.8", "serve-favicon": "2.5.0", "sharp": "0.31.1", From 4fcef7c54f0a263b12ff73301e8bbcb3f3cb5944 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:42:11 -0500 Subject: [PATCH 102/150] chore(deps): update dependency eslint to v8.27.0 (#11004) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 14d3552206..d47c5d75a5 100644 --- a/install/package.json +++ b/install/package.json @@ -152,7 +152,7 @@ "@commitlint/cli": "17.1.2", "@commitlint/config-angular": "17.1.0", "coveralls": "3.1.1", - "eslint": "8.25.0", + "eslint": "8.27.0", "eslint-config-nodebb": "0.1.1", "eslint-plugin-import": "2.26.0", "grunt": "1.5.3", From 5a5771e1b62314400986463b7b12c8930e5ab9e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:42:27 -0500 Subject: [PATCH 103/150] fix(deps): update dependency nodebb-plugin-composer-default to v9.2.4 (#10998) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index d47c5d75a5..5cddfbaee5 100644 --- a/install/package.json +++ b/install/package.json @@ -90,7 +90,7 @@ "@nodebb/bootswatch": "3.4.2", "nconf": "0.12.0", "nodebb-plugin-2factor": "5.1.1", - "nodebb-plugin-composer-default": "9.2.3", + "nodebb-plugin-composer-default": "9.2.4", "nodebb-plugin-dbsearch": "5.1.5", "nodebb-plugin-emoji": "4.0.6", "nodebb-plugin-emoji-android": "3.0.0", From 466263172ad061bff910060103401b78642af614 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 9 Nov 2022 18:46:09 +0000 Subject: [PATCH 104/150] chore: incrementing version number - v2.5.8 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ef7ad84789..2425804386 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "2.5.7", + "version": "2.5.8", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From c9cd8975a23e813ec7da24eb8ba3e7246b61fdb9 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 9 Nov 2022 18:46:09 +0000 Subject: [PATCH 105/150] chore: update changelog for v2.5.8 --- CHANGELOG.md | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50531c9433..7b0a3233e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,56 @@ +#### v2.5.8 (2022-11-09) + +##### Chores + +* really fix indents this time (c2024f34) +* fix indents (d50512e7) +* add bootstrap5 to test runner for now (be5d6d29) +* incrementing version number - v2.5.7 (5836bf4a) +* update changelog for v2.5.7 (17e948ab) +* incrementing version number - v2.5.6 (c7bd7dbf) +* incrementing version number - v2.5.5 (3509ed94) +* incrementing version number - v2.5.4 (e83260ca) +* incrementing version number - v2.5.3 (7e922936) +* incrementing version number - v2.5.2 (babcd17e) +* incrementing version number - v2.5.1 (ce3aa950) +* incrementing version number - v2.5.0 (01d276cb) +* incrementing version number - v2.4.5 (dd3e1a28) +* incrementing version number - v2.4.4 (d5525c87) +* incrementing version number - v2.4.3 (9c647c6c) +* incrementing version number - v2.4.2 (3aa7b855) +* incrementing version number - v2.4.1 (60cbd148) +* incrementing version number - v2.4.0 (4834cde3) +* incrementing version number - v2.3.1 (d2425942) +* incrementing version number - v2.3.0 (046ea120) + +##### New Features + +* new search hooks (b5d38bc6) +* add search data to filter:search.inContent (e3f21562) + +##### Bug Fixes + +* pass csrf_token into calls to /register/abort, #11017 (2f9d8c35) +* check for csrf token on /register/abort, + theme changes for v2.x branches of themes (55a197a7) +* upgrade script to work from 0.x to 2.x (a31ba824) +* #10519, image height in emails (673261ff) +* fallback language strings for #10987 (b9c8c02f) +* #10993, apply autoLocale middleware to guests only (6f673f80) +* check cid as well as template (9227b82e) +* revert breaking change, add back SocketUser.emailConfirm (9ee30fe7) +* in appropriately named language key `email-confirm-email2` (09f3ac65) +* correctly pass dev flag to package installer (7672194c) +* use `--omit=dev` flag for npm instead of `--production` (09cfd0bd) + +##### Refactors + +* use utils.debounce (d264c6ac) + +##### Tests + +* fix tests again (06d15391) +* fix test (c833d3cd) + #### v2.5.7 (2022-10-14) ##### Chores From 445f09f0dc9d3b5c2e7d6758beec134d05612acb Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 9 Nov 2022 13:48:07 -0500 Subject: [PATCH 106/150] chore: remove derpy extra changelog bits --- CHANGELOG.md | 65 ---------------------------------------------------- 1 file changed, 65 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b0a3233e4..37c93c0f8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,21 +7,6 @@ * add bootstrap5 to test runner for now (be5d6d29) * incrementing version number - v2.5.7 (5836bf4a) * update changelog for v2.5.7 (17e948ab) -* incrementing version number - v2.5.6 (c7bd7dbf) -* incrementing version number - v2.5.5 (3509ed94) -* incrementing version number - v2.5.4 (e83260ca) -* incrementing version number - v2.5.3 (7e922936) -* incrementing version number - v2.5.2 (babcd17e) -* incrementing version number - v2.5.1 (ce3aa950) -* incrementing version number - v2.5.0 (01d276cb) -* incrementing version number - v2.4.5 (dd3e1a28) -* incrementing version number - v2.4.4 (d5525c87) -* incrementing version number - v2.4.3 (9c647c6c) -* incrementing version number - v2.4.2 (3aa7b855) -* incrementing version number - v2.4.1 (60cbd148) -* incrementing version number - v2.4.0 (4834cde3) -* incrementing version number - v2.3.1 (d2425942) -* incrementing version number - v2.3.0 (046ea120) ##### New Features @@ -57,20 +42,6 @@ * incrementing version number - v2.5.6 (c7bd7dbf) * update changelog for v2.5.6 (e92238d0) -* incrementing version number - v2.5.5 (3509ed94) -* incrementing version number - v2.5.4 (e83260ca) -* incrementing version number - v2.5.3 (7e922936) -* incrementing version number - v2.5.2 (babcd17e) -* incrementing version number - v2.5.1 (ce3aa950) -* incrementing version number - v2.5.0 (01d276cb) -* incrementing version number - v2.4.5 (dd3e1a28) -* incrementing version number - v2.4.4 (d5525c87) -* incrementing version number - v2.4.3 (9c647c6c) -* incrementing version number - v2.4.2 (3aa7b855) -* incrementing version number - v2.4.1 (60cbd148) -* incrementing version number - v2.4.0 (4834cde3) -* incrementing version number - v2.3.1 (d2425942) -* incrementing version number - v2.3.0 (046ea120) ##### Performance Improvements @@ -82,19 +53,6 @@ * incrementing version number - v2.5.5 (3509ed94) * update changelog for v2.5.5 (e7d0040d) -* incrementing version number - v2.5.4 (e83260ca) -* incrementing version number - v2.5.3 (7e922936) -* incrementing version number - v2.5.2 (babcd17e) -* incrementing version number - v2.5.1 (ce3aa950) -* incrementing version number - v2.5.0 (01d276cb) -* incrementing version number - v2.4.5 (dd3e1a28) -* incrementing version number - v2.4.4 (d5525c87) -* incrementing version number - v2.4.3 (9c647c6c) -* incrementing version number - v2.4.2 (3aa7b855) -* incrementing version number - v2.4.1 (60cbd148) -* incrementing version number - v2.4.0 (4834cde3) -* incrementing version number - v2.3.1 (d2425942) -* incrementing version number - v2.3.0 (046ea120) ##### Bug Fixes @@ -108,18 +66,6 @@ * up plugins (b91ef6dd) * incrementing version number - v2.5.4 (e83260ca) * update changelog for v2.5.4 (aabf073c) -* incrementing version number - v2.5.3 (7e922936) -* incrementing version number - v2.5.2 (babcd17e) -* incrementing version number - v2.5.1 (ce3aa950) -* incrementing version number - v2.5.0 (01d276cb) -* incrementing version number - v2.4.5 (dd3e1a28) -* incrementing version number - v2.4.4 (d5525c87) -* incrementing version number - v2.4.3 (9c647c6c) -* incrementing version number - v2.4.2 (3aa7b855) -* incrementing version number - v2.4.1 (60cbd148) -* incrementing version number - v2.4.0 (4834cde3) -* incrementing version number - v2.3.1 (d2425942) -* incrementing version number - v2.3.0 (046ea120) #### v2.5.4 (2022-10-11) @@ -128,17 +74,6 @@ * 🤔 (7240e8ce) * incrementing version number - v2.5.3 (7e922936) * update changelog for v2.5.3 (fdf240f6) -* incrementing version number - v2.5.2 (babcd17e) -* incrementing version number - v2.5.1 (ce3aa950) -* incrementing version number - v2.5.0 (01d276cb) -* incrementing version number - v2.4.5 (dd3e1a28) -* incrementing version number - v2.4.4 (d5525c87) -* incrementing version number - v2.4.3 (9c647c6c) -* incrementing version number - v2.4.2 (3aa7b855) -* incrementing version number - v2.4.1 (60cbd148) -* incrementing version number - v2.4.0 (4834cde3) -* incrementing version number - v2.3.1 (d2425942) -* incrementing version number - v2.3.0 (046ea120) ##### Continuous Integration From 35d67ad33e7753d5c8f292ffd817c5094ee35571 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 13:48:59 -0500 Subject: [PATCH 107/150] fix(deps): update dependency autoprefixer to v10.4.13 (#11020) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index e5962ed205..c04b35e27f 100644 --- a/install/package.json +++ b/install/package.json @@ -33,7 +33,7 @@ "ace-builds": "1.12.3", "archiver": "5.3.1", "async": "3.2.4", - "autoprefixer": "10.4.12", + "autoprefixer": "10.4.13", "bcryptjs": "2.4.3", "benchpressjs": "2.4.3", "body-parser": "1.20.1", From 9ca2482a555dd45391a062a0275a6584adf56e72 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 13:49:28 -0500 Subject: [PATCH 108/150] fix(deps): update dependency mongodb to v4.11.0 (#10994) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(deps): update dependency mongodb to v4.11.0 * up composer Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Barış Soner Uşaklı --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index c04b35e27f..2dba6ddb19 100644 --- a/install/package.json +++ b/install/package.json @@ -83,7 +83,7 @@ "material-design-lite": "1.3.0", "mime": "3.0.0", "mkdirp": "1.0.4", - "mongodb": "4.10.0", + "mongodb": "4.11.0", "morgan": "1.10.0", "mousetrap": "1.6.5", "multiparty": "4.2.3", From de507f72eade8b8d828c027a7f598dc8a37ce5d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 13:49:37 -0500 Subject: [PATCH 109/150] fix(deps): update dependency ace-builds to v1.12.5 (#11019) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 2dba6ddb19..e43693df7c 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.1", - "ace-builds": "1.12.3", + "ace-builds": "1.12.5", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.13", From e144debb7f3fa247b364a8d63c105fb8600c8374 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 16:01:03 -0500 Subject: [PATCH 110/150] fix(deps): update dependency ioredis to v5.2.4 (#11022) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index e43693df7c..38bc7ff113 100644 --- a/install/package.json +++ b/install/package.json @@ -114,7 +114,7 @@ "postcss-clean": "1.2.0", "progress-webpack-plugin": "1.0.16", "prompt": "1.3.0", - "ioredis": "5.2.3", + "ioredis": "5.2.4", "request": "2.88.2", "request-promise-native": "1.0.9", "rimraf": "3.0.2", From c4a1905b83f32576f909d33913c56dd089ac5728 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 16:01:14 -0500 Subject: [PATCH 111/150] fix(deps): update dependency esbuild to v0.15.13 (#11021) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 38bc7ff113..06626bbe9c 100644 --- a/install/package.json +++ b/install/package.json @@ -58,7 +58,7 @@ "csurf": "1.11.0", "daemon": "1.1.0", "diff": "5.1.0", - "esbuild": "0.15.12", + "esbuild": "0.15.13", "express": "4.18.2", "express-session": "1.17.3", "express-useragent": "1.0.15", From 4b3978beda58714621cf1dcf9098d07bbd906625 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 16:01:26 -0500 Subject: [PATCH 112/150] chore(deps): update dependency husky to v8.0.2 (#11018) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 06626bbe9c..cdb09db43d 100644 --- a/install/package.json +++ b/install/package.json @@ -157,7 +157,7 @@ "eslint-plugin-import": "2.26.0", "grunt": "1.5.3", "grunt-contrib-watch": "1.1.0", - "husky": "8.0.1", + "husky": "8.0.2", "jsdom": "20.0.2", "lint-staged": "13.0.3", "mocha": "10.1.0", From 51919f7abffa69ef059e6faa9a6c7a3746c1ebde Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 18:08:56 -0500 Subject: [PATCH 113/150] fix(deps): update dependency sharp to v0.31.2 (#11024) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index cdb09db43d..82c0fcaf8d 100644 --- a/install/package.json +++ b/install/package.json @@ -122,7 +122,7 @@ "sanitize-html": "2.7.3", "semver": "7.3.8", "serve-favicon": "2.5.0", - "sharp": "0.31.1", + "sharp": "0.31.2", "sitemap": "7.1.1", "slideout": "1.0.1", "socket.io": "4.5.3", From 1ea2a32b0ffa1c57eb752798a9d9c95ebfb45f34 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 18:09:25 -0500 Subject: [PATCH 114/150] fix(deps): update dependency lru-cache to v7.14.1 (#11023) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 82c0fcaf8d..ac5e960b75 100644 --- a/install/package.json +++ b/install/package.json @@ -79,7 +79,7 @@ "less": "4.1.3", "lodash": "4.17.21", "logrotate-stream": "0.2.8", - "lru-cache": "7.14.0", + "lru-cache": "7.14.1", "material-design-lite": "1.3.0", "mime": "3.0.0", "mkdirp": "1.0.4", From 8d3907b53a9bc34508cb0c896f56bf5f660b1890 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 18:41:49 -0500 Subject: [PATCH 115/150] fix(deps): update dependency yargs to v17.6.2 (#11025) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ac5e960b75..fcfde34109 100644 --- a/install/package.json +++ b/install/package.json @@ -144,7 +144,7 @@ "winston": "3.8.2", "xml": "1.0.1", "xregexp": "5.1.1", - "yargs": "17.6.0", + "yargs": "17.6.2", "zxcvbn": "4.4.2" }, "devDependencies": { From 26be289e80e73880f4bbe16241edbf7adeaa2931 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 18:42:04 -0500 Subject: [PATCH 116/150] chore(deps): update commitlint monorepo to v17.2.0 (#11026) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index fcfde34109..fb4de09e44 100644 --- a/install/package.json +++ b/install/package.json @@ -149,8 +149,8 @@ }, "devDependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@commitlint/cli": "17.1.2", - "@commitlint/config-angular": "17.1.0", + "@commitlint/cli": "17.2.0", + "@commitlint/config-angular": "17.2.0", "coveralls": "3.1.1", "eslint": "8.27.0", "eslint-config-nodebb": "0.1.1", From 40c9cc053e202c8ef8891194a8dd1d75ce803a99 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 18:42:14 -0500 Subject: [PATCH 117/150] fix(deps): update dependency webpack to v5.75.0 (#11027) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index fb4de09e44..0640c16ad1 100644 --- a/install/package.json +++ b/install/package.json @@ -139,7 +139,7 @@ "toobusy-js": "0.5.1", "uglify-es": "3.3.9", "validator": "13.7.0", - "webpack": "5.74.0", + "webpack": "5.75.0", "webpack-merge": "5.8.0", "winston": "3.8.2", "xml": "1.0.1", From b34e859c1b1eea55bcd8c63a59c0e1c8998a978b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 10 Nov 2022 13:31:51 -0500 Subject: [PATCH 118/150] refactor: don't prevent startup if staticDir is undefined https://community.nodebb.org/topic/16790/problems-with-upgrading-to-2-xx --- src/plugins/data.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/data.js b/src/plugins/data.js index 9f95703217..ba6e319e78 100644 --- a/src/plugins/data.js +++ b/src/plugins/data.js @@ -106,6 +106,11 @@ Data.getStaticDirectories = async function (pluginData) { return; } const dirPath = await resolveModulePath(pluginData.path, pluginData.staticDirs[route]); + if (!dirPath) { + winston.warn(`[plugins/${pluginData.id}] Invalid mapped path specified: ${ + route} => ${pluginData.staticDirs[route]}`); + return; + } try { const stats = await fs.promises.stat(dirPath); if (!stats.isDirectory()) { From 313d0c3270edaf4ad879aed9cb9bb32c3640cf74 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:40:10 -0500 Subject: [PATCH 119/150] fix(deps): update dependency ace-builds to v1.13.0 (#11031) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 0640c16ad1..3251f1d543 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.1", - "ace-builds": "1.12.5", + "ace-builds": "1.13.0", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.13", From b94bb1bf93390e5204551bfc647049c6f8c5a60d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:40:22 -0500 Subject: [PATCH 120/150] fix(deps): update dependency postcss to v8.4.19 (#11028) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 3251f1d543..84e8cfd868 100644 --- a/install/package.json +++ b/install/package.json @@ -110,7 +110,7 @@ "passport-local": "1.0.0", "pg": "8.8.0", "pg-cursor": "2.7.4", - "postcss": "8.4.18", + "postcss": "8.4.19", "postcss-clean": "1.2.0", "progress-webpack-plugin": "1.0.16", "prompt": "1.3.0", From 61090615016c522c0a0fd5d48fd427219bf8fa02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 11 Nov 2022 11:14:30 -0500 Subject: [PATCH 121/150] fix: check schedule privilege, closes #11032 --- src/api/helpers.js | 2 +- src/api/topics.js | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/api/helpers.js b/src/api/helpers.js index fd215aa241..24c2540ccb 100644 --- a/src/api/helpers.js +++ b/src/api/helpers.js @@ -13,7 +13,7 @@ const events = require('../events'); exports.setDefaultPostData = function (reqOrSocket, data) { data.uid = reqOrSocket.uid; data.req = exports.buildReqObject(reqOrSocket, { ...data }); - data.timestamp = parseInt(data.timestamp, 10) || Date.now(); + data.timestamp = Date.now(); data.fromQueue = false; }; diff --git a/src/api/topics.js b/src/api/topics.js index 187bc064be..3cd98f0c20 100644 --- a/src/api/topics.js +++ b/src/api/topics.js @@ -40,13 +40,19 @@ topicsAPI.create = async function (caller, data) { const payload = { ...data }; payload.tags = payload.tags || []; apiHelpers.setDefaultPostData(caller, payload); + const isScheduling = parseInt(data.timestamp, 10) > payload.timestamp; + if (isScheduling) { + if (await privileges.categories.can('topics:schedule', data.cid, caller.uid)) { + payload.timestamp = parseInt(data.timestamp, 10); + } else { + throw new Error('[[error:no-privileges]]'); + } + } - // Blacklist & Post Queue await meta.blacklist.test(caller.ip); const shouldQueue = await posts.shouldQueue(caller.uid, payload); if (shouldQueue) { - const queueObj = await posts.addToQueue(payload); - return queueObj; + return await posts.addToQueue(payload); } const result = await topics.post(payload); @@ -66,12 +72,10 @@ topicsAPI.reply = async function (caller, data) { const payload = { ...data }; apiHelpers.setDefaultPostData(caller, payload); - // Blacklist & Post Queue await meta.blacklist.test(caller.ip); const shouldQueue = await posts.shouldQueue(caller.uid, payload); if (shouldQueue) { - const queueObj = await posts.addToQueue(payload); - return queueObj; + return await posts.addToQueue(payload); } const postData = await topics.reply(payload); // postData seems to be a subset of postObj, refactor? From 3c85b944e30a0ba8b3ec9e1f441c74f383625a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 11 Nov 2022 16:23:00 -0500 Subject: [PATCH 122/150] feat: allow groups to be exempt from maintenance mode closes #11030 --- install/data/defaults.json | 1 + public/language/en-GB/admin/settings/advanced.json | 1 + src/controllers/admin/settings.js | 7 +++++++ src/groups/update.js | 10 +++++++++- src/middleware/maintenance.js | 9 +++++++-- src/routes/admin.js | 1 + src/views/admin/settings/advanced.tpl | 8 ++++++++ test/controllers.js | 12 ++++++++++++ 8 files changed, 46 insertions(+), 3 deletions(-) diff --git a/install/data/defaults.json b/install/data/defaults.json index 130e72fd5a..e7bf3f65f4 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -25,6 +25,7 @@ "postQueue": 0, "postQueueReputationThreshold": 0, "groupsExemptFromPostQueue": ["administrators", "Global Moderators"], + "groupsExemptFromMaintenanceMode": ["administrators", "Global Moderators"], "minimumPostLength": 8, "maximumPostLength": 32767, "systemTags": "", diff --git a/public/language/en-GB/admin/settings/advanced.json b/public/language/en-GB/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/en-GB/admin/settings/advanced.json +++ b/public/language/en-GB/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/src/controllers/admin/settings.js b/src/controllers/admin/settings.js index 719f6e206a..ca0765cc02 100644 --- a/src/controllers/admin/settings.js +++ b/src/controllers/admin/settings.js @@ -48,6 +48,13 @@ settingsController.post = async (req, res) => { }); }; +settingsController.advanced = async (req, res) => { + const groupData = await groups.getNonPrivilegeGroups('groups:createtime', 0, -1); + res.render('admin/settings/advanced', { + groupsExemptFromMaintenanceMode: groupData, + }); +}; + settingsController.languages = async function (req, res) { const languageData = await languages.list(); languageData.forEach((language) => { diff --git a/src/groups/update.js b/src/groups/update.js index 24f4b53797..56b541df27 100644 --- a/src/groups/update.js +++ b/src/groups/update.js @@ -274,8 +274,16 @@ module.exports = function (Groups) { async function updateConfig(oldName, newName) { if (meta.config.groupsExemptFromPostQueue.includes(oldName)) { - meta.config.groupsExemptFromPostQueue.splice(meta.config.groupsExemptFromPostQueue.indexOf(oldName), 1, newName); + meta.config.groupsExemptFromPostQueue.splice( + meta.config.groupsExemptFromPostQueue.indexOf(oldName), 1, newName + ); await meta.configs.set('groupsExemptFromPostQueue', meta.config.groupsExemptFromPostQueue); } + if (meta.config.groupsExemptFromMaintenanceMode.includes(oldName)) { + meta.config.groupsExemptFromMaintenanceMode.splice( + meta.config.groupsExemptFromMaintenanceMode.indexOf(oldName), 1, newName + ); + await meta.configs.set('groupsExemptFromMaintenanceMode', meta.config.groupsExemptFromMaintenanceMode); + } } }; diff --git a/src/middleware/maintenance.js b/src/middleware/maintenance.js index 46fb05dcae..2e56fff8b6 100644 --- a/src/middleware/maintenance.js +++ b/src/middleware/maintenance.js @@ -4,6 +4,7 @@ const util = require('util'); const nconf = require('nconf'); const meta = require('../meta'); const user = require('../user'); +const groups = require('../groups'); const helpers = require('./helpers'); module.exports = function (middleware) { @@ -20,8 +21,12 @@ module.exports = function (middleware) { return next(); } - const isAdmin = await user.isAdministrator(req.uid); - if (isAdmin) { + const [isAdmin, isMemberOfExempt] = await Promise.all([ + user.isAdministrator(req.uid), + groups.isMemberOfAny(req.uid, meta.config.groupsExemptFromMaintenanceMode), + ]); + + if (isAdmin || isMemberOfExempt) { return next(); } diff --git a/src/routes/admin.js b/src/routes/admin.js index 3134e8d9ae..aac0e5dfb0 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -34,6 +34,7 @@ module.exports = function (app, name, middleware, controllers) { helpers.setupAdminPageRoute(app, `/${name}/settings/email`, middlewares, controllers.admin.settings.email); helpers.setupAdminPageRoute(app, `/${name}/settings/user`, middlewares, controllers.admin.settings.user); helpers.setupAdminPageRoute(app, `/${name}/settings/post`, middlewares, controllers.admin.settings.post); + helpers.setupAdminPageRoute(app, `/${name}/settings/advanced`, middlewares, controllers.admin.settings.advanced); helpers.setupAdminPageRoute(app, `/${name}/settings/languages`, middlewares, controllers.admin.settings.languages); helpers.setupAdminPageRoute(app, `/${name}/settings/navigation`, middlewares, controllers.admin.settings.navigation); helpers.setupAdminPageRoute(app, `/${name}/settings/homepage`, middlewares, controllers.admin.settings.homepage); diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl index ae8f6e5c4d..83d010ad63 100644 --- a/src/views/admin/settings/advanced.tpl +++ b/src/views/admin/settings/advanced.tpl @@ -21,6 +21,14 @@
      +
      + + +
      diff --git a/test/controllers.js b/test/controllers.js index f255380446..cf557a30d2 100644 --- a/test/controllers.js +++ b/test/controllers.js @@ -1233,6 +1233,18 @@ describe('Controllers', () => { done(); }); }); + + it('should return 200 if guests are allowed', (done) => { + const oldValue = meta.config.groupsExemptFromMaintenanceMode; + meta.config.groupsExemptFromMaintenanceMode.push('guests'); + request(`${nconf.get('url')}/api/recent`, { json: true }, (err, res, body) => { + assert.ifError(err); + assert.strictEqual(res.statusCode, 200); + assert(body); + meta.config.groupsExemptFromMaintenanceMode = oldValue; + done(); + }); + }); }); describe('account pages', () => { From 05b6758e594df0b5e2c1344476c8e4d4df3597b2 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Fri, 11 Nov 2022 21:23:43 +0000 Subject: [PATCH 123/150] chore(i18n): fallback strings for new resources: nodebb.admin-settings-advanced --- public/language/ar/admin/settings/advanced.json | 1 + public/language/bg/admin/settings/advanced.json | 1 + public/language/bn/admin/settings/advanced.json | 1 + public/language/cs/admin/settings/advanced.json | 1 + public/language/da/admin/settings/advanced.json | 1 + public/language/de/admin/settings/advanced.json | 1 + public/language/el/admin/settings/advanced.json | 1 + public/language/en-US/admin/settings/advanced.json | 1 + public/language/en-x-pirate/admin/settings/advanced.json | 1 + public/language/es/admin/settings/advanced.json | 1 + public/language/et/admin/settings/advanced.json | 1 + public/language/fa-IR/admin/settings/advanced.json | 1 + public/language/fi/admin/settings/advanced.json | 1 + public/language/fr/admin/settings/advanced.json | 1 + public/language/gl/admin/settings/advanced.json | 1 + public/language/he/admin/settings/advanced.json | 1 + public/language/hr/admin/settings/advanced.json | 1 + public/language/hu/admin/settings/advanced.json | 1 + public/language/id/admin/settings/advanced.json | 1 + public/language/it/admin/settings/advanced.json | 1 + public/language/ja/admin/settings/advanced.json | 1 + public/language/ko/admin/settings/advanced.json | 1 + public/language/lt/admin/settings/advanced.json | 1 + public/language/lv/admin/settings/advanced.json | 1 + public/language/ms/admin/settings/advanced.json | 1 + public/language/nb/admin/settings/advanced.json | 1 + public/language/nl/admin/settings/advanced.json | 1 + public/language/pl/admin/settings/advanced.json | 1 + public/language/pt-BR/admin/settings/advanced.json | 1 + public/language/pt-PT/admin/settings/advanced.json | 1 + public/language/ro/admin/settings/advanced.json | 1 + public/language/ru/admin/settings/advanced.json | 1 + public/language/rw/admin/settings/advanced.json | 1 + public/language/sc/admin/settings/advanced.json | 1 + public/language/sk/admin/settings/advanced.json | 1 + public/language/sl/admin/settings/advanced.json | 1 + public/language/sq-AL/admin/settings/advanced.json | 1 + public/language/sr/admin/settings/advanced.json | 1 + public/language/sv/admin/settings/advanced.json | 1 + public/language/th/admin/settings/advanced.json | 1 + public/language/tr/admin/settings/advanced.json | 1 + public/language/uk/admin/settings/advanced.json | 1 + public/language/vi/admin/settings/advanced.json | 1 + public/language/zh-CN/admin/settings/advanced.json | 1 + public/language/zh-TW/admin/settings/advanced.json | 1 + 45 files changed, 45 insertions(+) diff --git a/public/language/ar/admin/settings/advanced.json b/public/language/ar/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/ar/admin/settings/advanced.json +++ b/public/language/ar/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/bg/admin/settings/advanced.json b/public/language/bg/admin/settings/advanced.json index 9ecc674fab..b154c9b8b5 100644 --- a/public/language/bg/admin/settings/advanced.json +++ b/public/language/bg/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Когато форумът е в режим на профилактика, всички заявки ще бъдат пренасочвани към статична страница за изчакване, с изключение на администраторите, които ще могат да използват уеб сайта нормално.", "maintenance-mode.status": "Код на състоянието за режима на профилактика", "maintenance-mode.message": "Съобщение за профилактиката", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Заглавни части", "headers.allow-from": "Задайте „ALLOW-FROM“, за да поставите NodeBB в „iFrame“", "headers.csp-frame-ancestors": "Задайте заглавката „Content-Security-Policy frame-ancestors“ за да поставите NodeBB „iFrame“", diff --git a/public/language/bn/admin/settings/advanced.json b/public/language/bn/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/bn/admin/settings/advanced.json +++ b/public/language/bn/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/cs/admin/settings/advanced.json b/public/language/cs/admin/settings/advanced.json index 4aad647e91..d5c6befa77 100644 --- a/public/language/cs/admin/settings/advanced.json +++ b/public/language/cs/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Je-li fórum v režimu údržby, všechny požadavky budou přesměrovány na statickou stránku. Správci jsou vyloučeni z tohoto přesměrování a budou mít normálně zobrazené stránky.", "maintenance-mode.status": "Stavový kód režimu údržby", "maintenance-mode.message": "Zpráva údržby", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Hlavičky", "headers.allow-from": "Nastavte ALLOW-FROM pro umístění NodeBB do iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/da/admin/settings/advanced.json b/public/language/da/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/da/admin/settings/advanced.json +++ b/public/language/da/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/de/admin/settings/advanced.json b/public/language/de/admin/settings/advanced.json index 0ebe167a14..6d6e0005f5 100644 --- a/public/language/de/admin/settings/advanced.json +++ b/public/language/de/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Wenn sich das Forum im Wartungsmodus befindet, werden alle Anfragen auf eine statische Warteseite umgeleitet. Administratoren sind von dieser Umleitung ausgenommen und können normal auf die Site zugreifen.", "maintenance-mode.status": "Statuscode für Wartungsmodus", "maintenance-mode.message": "Wartungsnachricht", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "ALLOW-FROM setzen um NodeBB in einem iFrame zu platzieren", "headers.csp-frame-ancestors": "Content-Security-Policy frame-ancestors header setzen, um NodeBB in einem iFrame zu platzieren", diff --git a/public/language/el/admin/settings/advanced.json b/public/language/el/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/el/admin/settings/advanced.json +++ b/public/language/el/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/en-US/admin/settings/advanced.json b/public/language/en-US/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/en-US/admin/settings/advanced.json +++ b/public/language/en-US/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/en-x-pirate/admin/settings/advanced.json b/public/language/en-x-pirate/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/en-x-pirate/admin/settings/advanced.json +++ b/public/language/en-x-pirate/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/es/admin/settings/advanced.json b/public/language/es/admin/settings/advanced.json index d79f6c9a56..8efe29570f 100644 --- a/public/language/es/admin/settings/advanced.json +++ b/public/language/es/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Cuando este foro están en Modo de Mantenimiento, todas las peticiones serán redirigidas a una página estática de mantenimiento. Los administradores están exentos de esta redirección, y pueden acceder al sitio normalmente.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Mensaje de Mantenimiento", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Cabeceras", "headers.allow-from": "Establecer ALLOW-FROM para poner NodeBB en un iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/et/admin/settings/advanced.json b/public/language/et/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/et/admin/settings/advanced.json +++ b/public/language/et/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/fa-IR/admin/settings/advanced.json b/public/language/fa-IR/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/fa-IR/admin/settings/advanced.json +++ b/public/language/fa-IR/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/fi/admin/settings/advanced.json b/public/language/fi/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/fi/admin/settings/advanced.json +++ b/public/language/fi/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/fr/admin/settings/advanced.json b/public/language/fr/admin/settings/advanced.json index a893503aa2..4f97ce90cb 100644 --- a/public/language/fr/admin/settings/advanced.json +++ b/public/language/fr/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Quand le forum est en mode maintenance, toutes les requêtes sont redirigées vers une page de garde statique. Les administrateurs sont exemptés de cette redirection et peuvent accéder normalement au site. ", "maintenance-mode.status": "Mode maintenance", "maintenance-mode.message": "Message de maintenance", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "En-têtes", "headers.allow-from": "Définissez ALLOW-FROM pour afficher NodeBB dans un iFrame", "headers.csp-frame-ancestors": "Définir la politique de sécurité pour pouvoir intégrer des iframes", diff --git a/public/language/gl/admin/settings/advanced.json b/public/language/gl/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/gl/admin/settings/advanced.json +++ b/public/language/gl/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/he/admin/settings/advanced.json b/public/language/he/admin/settings/advanced.json index 720a9a97e1..dab98f1f59 100644 --- a/public/language/he/admin/settings/advanced.json +++ b/public/language/he/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "כאשר הפורום נמצא במצב תחזוקה, כל הבקשות יופנו לדף אחזקה סטטי. מנהלים לא יגיעו להפניה זו, והם יוכלו לגשת לאתר כרגיל.", "maintenance-mode.status": "קוד מצב תחזוקה", "maintenance-mode.message": "הודעת תחזוקה", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "כותרות", "headers.allow-from": "הגדר ALLOW-FROM למקם NodeBB ב- iFrame", "headers.csp-frame-ancestors": "הגדר את מדיניות האבטחה (Content-Security-Policy) עבור ההטמעה (frame-ancestors) של NodeBB בתוך Iframe", diff --git a/public/language/hr/admin/settings/advanced.json b/public/language/hr/admin/settings/advanced.json index 071321ff45..dd015e7caf 100644 --- a/public/language/hr/admin/settings/advanced.json +++ b/public/language/hr/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Kada je forum u stanju održavanja,svi zahtjevi će biti preusmjereni statičnoj stranici.Administratori su izuzeti od ovog preusmjerenja i mogu normalno koristiti stranicu.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Poruka održavanja", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Zaglavlje", "headers.allow-from": "Izaberi ALLOW-FROM da bi ste postavili NodeBB u iFrame.", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/hu/admin/settings/advanced.json b/public/language/hu/admin/settings/advanced.json index 0ed27c3041..fce398dceb 100644 --- a/public/language/hu/admin/settings/advanced.json +++ b/public/language/hu/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Amikor a fórum karbantartási módban van, minden kérés átirányításra kerül egy statikus feltartóztató oldalra. Az adminisztrátorok kivételnek számítanak ez alól, és szokásos módon hozzáférhetnek az oldalhoz.", "maintenance-mode.status": "Karbantartási mód HTTP státuszkódja", "maintenance-mode.message": "A karbantartás üzenete", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Fejlécek", "headers.allow-from": "ALLOW-FROM beállítása, hogy a NodeBB egy iFrame-be kerüljön", "headers.csp-frame-ancestors": "Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/id/admin/settings/advanced.json b/public/language/id/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/id/admin/settings/advanced.json +++ b/public/language/id/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/it/admin/settings/advanced.json b/public/language/it/admin/settings/advanced.json index 119192b6a4..6435a7a1d6 100644 --- a/public/language/it/admin/settings/advanced.json +++ b/public/language/it/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Quando il forum è in modalità manutenzione, tutte le richieste saranno reindirizzate ad una pagina di attesa statica. Gli amministratori sono esenti da questo reindirizzamento e sono in grado di accedere al sito normalmente.", "maintenance-mode.status": "Codice stato modalità manutenzione", "maintenance-mode.message": "Messaggio di manutenzione", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Intestazioni", "headers.allow-from": "Imposta ALLOW-FROM per posizionare NodeBBB in un iFrame", "headers.csp-frame-ancestors": "Imposta l'intestazione Content-Security-Policy frame-ancestors su Place NodeBB in un iFrame", diff --git a/public/language/ja/admin/settings/advanced.json b/public/language/ja/admin/settings/advanced.json index a162199c96..999219c902 100644 --- a/public/language/ja/admin/settings/advanced.json +++ b/public/language/ja/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "フォーラムがメンテナンスモードの場合、すべてのリクエストは静的な一時ページにリダイレクトされます。管理者はこのリダイレクトから免除され、通常のサイトにアクセスできます。", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "メンテナンスメッセージ", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "ヘッダー", "headers.allow-from": "NodeBBをインラインフレーム内に配置するようALLOW-FROMを設定する", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/ko/admin/settings/advanced.json b/public/language/ko/admin/settings/advanced.json index 9a33814940..99d1df901f 100644 --- a/public/language/ko/admin/settings/advanced.json +++ b/public/language/ko/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "포럼이 점검 모드일 경우 모든 접속 요청은 정적 페이지로 리다이렉트됩니다. 관리자는 이 리다이렉션에 적용되지 않고 사이트에 접속하는 것이 가능합니다.", "maintenance-mode.status": "점검 모드 상태 코드", "maintenance-mode.message": "점검 공지", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "헤더", "headers.allow-from": "NodeBB를 iFrame에 삽입할 수 있게 하시려면, ALLOW-FROM(NodeBB를 Embedding할 수 있는 도메인)을 설정하세요.", "headers.csp-frame-ancestors": "NodeBB를 iFrame에 삽입하기 위한 컨텐츠 보안 정책 frame-ancestors 헤더 설정", diff --git a/public/language/lt/admin/settings/advanced.json b/public/language/lt/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/lt/admin/settings/advanced.json +++ b/public/language/lt/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/lv/admin/settings/advanced.json b/public/language/lv/admin/settings/advanced.json index 5358182884..abe27d1cea 100644 --- a/public/language/lv/admin/settings/advanced.json +++ b/public/language/lv/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Kad forums atrodas apkopes režīmā, visa piekļuve tiks novirzīta uz statisku lapu. Uz administratoriem neattiecas šī novirzīšana un viņi var piekļūt vietnei kā parasti.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Apkopes paziņojums", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Iezīmes", "headers.allow-from": "Iestatīt ALLOW-FROM, lai atļautu NodeBB ievietot iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/ms/admin/settings/advanced.json b/public/language/ms/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/ms/admin/settings/advanced.json +++ b/public/language/ms/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/nb/admin/settings/advanced.json b/public/language/nb/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/nb/admin/settings/advanced.json +++ b/public/language/nb/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/nl/admin/settings/advanced.json b/public/language/nl/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/nl/admin/settings/advanced.json +++ b/public/language/nl/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/pl/admin/settings/advanced.json b/public/language/pl/admin/settings/advanced.json index d15d74825e..8e22b66403 100644 --- a/public/language/pl/admin/settings/advanced.json +++ b/public/language/pl/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Kiedy forum jest w trybie konserwacji, wszystkie żądania będą przekierowane do statycznej strony oczekiwania. Administratorzy nie są objęci tym przekierowaniem i mogą normalnie korzystać ze strony.", "maintenance-mode.status": "Kod stanu trybu konserwacji", "maintenance-mode.message": "Komunikat na ekranie konserwacji", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Nagłówki", "headers.allow-from": "Ustaw ALLOW-FROM, aby umieścić NodeBB w ramce iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/pt-BR/admin/settings/advanced.json b/public/language/pt-BR/admin/settings/advanced.json index f9ebbe4c99..51e6ef17d3 100644 --- a/public/language/pt-BR/admin/settings/advanced.json +++ b/public/language/pt-BR/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Quando o fórum está em modo de manutenção, todas as solicitações serão redirecionadas para uma página estática. Administradores não sofrem este redirecionamento e podem acessar o site normalmente.", "maintenance-mode.status": "Código de Status de Modo de Mautenção", "maintenance-mode.message": "Mensagem de Manutenção", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Cabeçalhos", "headers.allow-from": "Defina ALLOW-FROM para Colocar o NodeBB em um iFrame", "headers.csp-frame-ancestors": "Define o cabeçalho de Content-Security-Policy frame-ancestors para Colocar o NodeBB em um iFrame", diff --git a/public/language/pt-PT/admin/settings/advanced.json b/public/language/pt-PT/admin/settings/advanced.json index b31b5f7579..81de9f21e5 100644 --- a/public/language/pt-PT/admin/settings/advanced.json +++ b/public/language/pt-PT/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Código de Estado do Modo de Manutenção", "maintenance-mode.message": "Mensagem de Manutenção", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/ro/admin/settings/advanced.json b/public/language/ro/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/ro/admin/settings/advanced.json +++ b/public/language/ro/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/ru/admin/settings/advanced.json b/public/language/ru/admin/settings/advanced.json index b778295dfa..f426df26d4 100644 --- a/public/language/ru/admin/settings/advanced.json +++ b/public/language/ru/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Когда включен режим техобслуживания, все запросы перенаправляются на специальную страницу-заглушку. Только администраторы сохраняют обычный доступ к форуму.", "maintenance-mode.status": "Код состояния HTTP для страницы-заглушки", "maintenance-mode.message": "Сообщение для пользователей", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Заголовки", "headers.allow-from": "Опция ALLOW-FROM для использования NodeBB через iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/rw/admin/settings/advanced.json b/public/language/rw/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/rw/admin/settings/advanced.json +++ b/public/language/rw/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/sc/admin/settings/advanced.json b/public/language/sc/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/sc/admin/settings/advanced.json +++ b/public/language/sc/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/sk/admin/settings/advanced.json b/public/language/sk/admin/settings/advanced.json index 10bf96a719..95a77ab4dc 100644 --- a/public/language/sk/admin/settings/advanced.json +++ b/public/language/sk/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Ak je fórum v režime údržby, všetky požiadavky budú presmerované na statickú stránku. Administrátori sú vylúčení z tohto presmerovania a majú prístup na stránku normálne.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Správa údržby", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Hlavičky", "headers.allow-from": "Nastavte ALLOW-FROM pro umístění NodeBB do iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/sl/admin/settings/advanced.json b/public/language/sl/admin/settings/advanced.json index be9f3de4dd..f899857086 100644 --- a/public/language/sl/admin/settings/advanced.json +++ b/public/language/sl/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Ko je forum v načinu vzdrževanja, bodo vse zahteve preusmerjene na statično stran za shranjevanje. Skrbniki so izvzeti iz te preusmeritve in lahko normalno dostopajo do spletnega mesta.", "maintenance-mode.status": "Koda stanja načina vzdrževanja", "maintenance-mode.message": "Sporočilo o vzdrževanju", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Glave", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/sq-AL/admin/settings/advanced.json b/public/language/sq-AL/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/sq-AL/admin/settings/advanced.json +++ b/public/language/sq-AL/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/sr/admin/settings/advanced.json b/public/language/sr/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/sr/admin/settings/advanced.json +++ b/public/language/sr/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/sv/admin/settings/advanced.json b/public/language/sv/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/sv/admin/settings/advanced.json +++ b/public/language/sv/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/th/admin/settings/advanced.json b/public/language/th/admin/settings/advanced.json index e372d48d70..1bf35d7370 100644 --- a/public/language/th/admin/settings/advanced.json +++ b/public/language/th/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Maintenance Message", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/tr/admin/settings/advanced.json b/public/language/tr/admin/settings/advanced.json index 91131d3bdd..c9fab4313d 100644 --- a/public/language/tr/admin/settings/advanced.json +++ b/public/language/tr/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Forum bakım modundayken, tüm istekler statik bir bekletme sayfasına yönlendirilir. Yöneticiler bu yönlendirmeden muaftır ve siteye normal olarak erişebilirler.", "maintenance-mode.status": "Bakım Modu Durum Kodu", "maintenance-mode.message": "Bakım Mesajı", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Başlıklar", "headers.allow-from": "NodeBB'yi bir iFrame'e yerleştirmek için ALLOW-FROM'u ayarla", "headers.csp-frame-ancestors": "NodeBB'yi bir iFrame'e yerleştirmek için Content-Security-Policy frame-ancestors başlığını ayarla", diff --git a/public/language/uk/admin/settings/advanced.json b/public/language/uk/admin/settings/advanced.json index ecc621aadc..abff8ca55f 100644 --- a/public/language/uk/admin/settings/advanced.json +++ b/public/language/uk/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Коли форум знаходиться в режимі обслуговування, всі запити перенаправляються на статичну сторінку. Адміністратори, в свою чергу, не перенаправляються і можуть відвідувати сайт у звичному режимі.", "maintenance-mode.status": "Maintenance Mode Status Code", "maintenance-mode.message": "Повідомлення обслуговування", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Заголовки", "headers.allow-from": "Задати ALLOW-FROM для розміщення NodeBB в iFrame", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", diff --git a/public/language/vi/admin/settings/advanced.json b/public/language/vi/admin/settings/advanced.json index 9a64310975..5455bcbe6c 100644 --- a/public/language/vi/admin/settings/advanced.json +++ b/public/language/vi/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "Khi diễn đàn ở chế độ bảo trì, tất cả các yêu cầu sẽ được chuyển hướng đến một trang giữ tĩnh. Quản trị viên không bị chuyển hướng này và có thể truy cập trang bình thường.", "maintenance-mode.status": "Mã Trạng Thái Chế Độ Bảo Trì", "maintenance-mode.message": "Thông Báo Bảo Trì", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "Headers", "headers.allow-from": "Đặt ALLOW-FROM để đặt NodeBB trong iFrame", "headers.csp-frame-ancestors": "Đặt giá trị Content-Security-Policy frame-ancestors ở phần đầu trang để Đặt NodeBB trong iFrame", diff --git a/public/language/zh-CN/admin/settings/advanced.json b/public/language/zh-CN/admin/settings/advanced.json index 48923a0fbe..1ebb76d2ba 100644 --- a/public/language/zh-CN/admin/settings/advanced.json +++ b/public/language/zh-CN/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "当论坛处在维护模式时，所有请求将被重定向到一个静态页面。管理员不受重定向限制，并可正常访问站点。", "maintenance-mode.status": "维护模式状态码", "maintenance-mode.message": "维护消息", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "标题", "headers.allow-from": "设置 ALLOW-FROM 来放置 NodeBB 于 iFrame 中", "headers.csp-frame-ancestors": "设置 Content-Security-Policy frame-ancestors 响应头来将 NodeBB 置于 iFrame 中", diff --git a/public/language/zh-TW/admin/settings/advanced.json b/public/language/zh-TW/admin/settings/advanced.json index 1ce6b993a7..63ca8cbe3f 100644 --- a/public/language/zh-TW/admin/settings/advanced.json +++ b/public/language/zh-TW/admin/settings/advanced.json @@ -3,6 +3,7 @@ "maintenance-mode.help": "當論壇處在維護模式時，所有請求將被重導向到一個靜態頁面。管理員不受重導向限制，並可正常訪問網站。", "maintenance-mode.status": "維護模式狀態碼", "maintenance-mode.message": "維護訊息", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", "headers": "標題", "headers.allow-from": "設定 ALLOW-FROM 來放置 NodeBB 於 iFrame 中", "headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame", From 6a526631b442686380bce193a3b4d8e05afb3f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 11 Nov 2022 17:36:45 -0500 Subject: [PATCH 124/150] add openapi --- public/openapi/read.yaml | 2 ++ .../openapi/read/admin/settings/advanced.yaml | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 public/openapi/read/admin/settings/advanced.yaml diff --git a/public/openapi/read.yaml b/public/openapi/read.yaml index 31b446d351..ce6c0936fe 100644 --- a/public/openapi/read.yaml +++ b/public/openapi/read.yaml @@ -96,6 +96,8 @@ paths: $ref: 'read/admin/settings/user.yaml' /api/admin/settings/post: $ref: 'read/admin/settings/post.yaml' + /api/admin/settings/advanced: + $ref: 'read/admin/settings/advanced.yaml' /api/admin/manage/categories: $ref: 'read/admin/manage/categories.yaml' "/api/admin/manage/categories/{category_id}": diff --git a/public/openapi/read/admin/settings/advanced.yaml b/public/openapi/read/admin/settings/advanced.yaml new file mode 100644 index 0000000000..2cebeeb7e9 --- /dev/null +++ b/public/openapi/read/admin/settings/advanced.yaml @@ -0,0 +1,18 @@ +get: + tags: + - admin + summary: Get advanced settings + responses: + "200": + description: "" + content: + application/json: + schema: + allOf: + - type: object + properties: + groupsExemptFromMaintenanceMode: + type: array + items: + $ref: ../../../components/schemas/GroupObject.yaml#/GroupDataObject + - $ref: ../../../components/schemas/CommonProps.yaml#/CommonProps \ No newline at end of file From 98c949e4ec6be911af3b114fa45d11bfe77ec56d Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Mon, 14 Nov 2022 09:06:04 +0000 Subject: [PATCH 125/150] Latest translations and fallbacks --- public/language/it/admin/settings/advanced.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/it/admin/settings/advanced.json b/public/language/it/admin/settings/advanced.json index 6435a7a1d6..0f1df9e192 100644 --- a/public/language/it/admin/settings/advanced.json +++ b/public/language/it/admin/settings/advanced.json @@ -3,7 +3,7 @@ "maintenance-mode.help": "Quando il forum è in modalità manutenzione, tutte le richieste saranno reindirizzate ad una pagina di attesa statica. Gli amministratori sono esenti da questo reindirizzamento e sono in grado di accedere al sito normalmente.", "maintenance-mode.status": "Codice stato modalità manutenzione", "maintenance-mode.message": "Messaggio di manutenzione", - "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Seleziona i gruppi che dovrebbero essere esenti dalla modalità di manutenzione", "headers": "Intestazioni", "headers.allow-from": "Imposta ALLOW-FROM per posizionare NodeBBB in un iFrame", "headers.csp-frame-ancestors": "Imposta l'intestazione Content-Security-Policy frame-ancestors su Place NodeBB in un iFrame", From 2af7fd5f42c992755d88fd4f724d14146742eb48 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 15:16:37 +0000 Subject: [PATCH 126/150] fix(deps): update dependency nodebb-theme-persona to v12.1.11 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 84e8cfd868..6f572fca69 100644 --- a/install/package.json +++ b/install/package.json @@ -99,7 +99,7 @@ "nodebb-plugin-spam-be-gone": "1.0.2", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", - "nodebb-theme-persona": "12.1.10", + "nodebb-theme-persona": "12.1.11", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.19", "nodebb-widget-essentials": "6.0.0", From a5355d78856de704ea72087751bb1e90a372117f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Nov 2022 06:21:05 +0000 Subject: [PATCH 127/150] fix(deps): update dependency esbuild to v0.15.14 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 6f572fca69..c2a1485066 100644 --- a/install/package.json +++ b/install/package.json @@ -58,7 +58,7 @@ "csurf": "1.11.0", "daemon": "1.1.0", "diff": "5.1.0", - "esbuild": "0.15.13", + "esbuild": "0.15.14", "express": "4.18.2", "express-session": "1.17.3", "express-useragent": "1.0.15", From abcfb63126389146ff7d76bd5ce3e4e7426ea663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 15 Nov 2022 17:53:15 -0500 Subject: [PATCH 128/150] fix: #11044, allow banned users to post if given privileges --- src/user/posts.js | 6 +----- test/user.js | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/user/posts.js b/src/user/posts.js index 33f7464a71..9ca31cd6e7 100644 --- a/src/user/posts.js +++ b/src/user/posts.js @@ -18,7 +18,7 @@ module.exports = function (User) { return; } const [userData, isAdminOrMod] = await Promise.all([ - User.getUserFields(uid, ['uid', 'banned', 'mutedUntil', 'joindate', 'email', 'reputation'].concat([field])), + User.getUserFields(uid, ['uid', 'mutedUntil', 'joindate', 'email', 'reputation'].concat([field])), privileges.categories.isAdminOrMod(cid, uid), ]); @@ -30,10 +30,6 @@ module.exports = function (User) { return; } - if (userData.banned) { - throw new Error('[[error:user-banned]]'); - } - const now = Date.now(); if (userData.mutedUntil > now) { let muteLeft = ((userData.mutedUntil - now) / (1000 * 60)); diff --git a/test/user.js b/test/user.js index 176ee82827..d05f81778b 100644 --- a/test/user.js +++ b/test/user.js @@ -24,6 +24,7 @@ const file = require('../src/file'); const socketUser = require('../src/socket.io/user'); const apiUser = require('../src/api/users'); const utils = require('../src/utils'); +const privileges = require('../src/privileges'); describe('User', () => { let userData; @@ -1434,6 +1435,32 @@ describe('User', () => { assert.strictEqual(membership.get('verified-users'), true); assert.strictEqual(membership.get('unverified-users'), false); }); + + it('should be able to post in category for banned users', async () => { + const { cid } = await Categories.create({ + name: 'Test Category', + description: 'A test', + order: 1, + }); + const testUid = await User.create({ username: userData.username }); + await User.bans.ban(testUid); + let _err; + try { + await Topics.post({ title: 'banned topic', content: 'tttttttttttt', cid: cid, uid: testUid }); + } catch (err) { + _err = err; + } + assert.strictEqual(_err && _err.message, '[[error:no-privileges]]'); + + await Promise.all([ + privileges.categories.give(['groups:topics:create', 'groups:topics:reply'], cid, 'banned-users'), + privileges.categories.rescind(['groups:topics:create', 'groups:topics:reply'], cid, 'registered-users'), + ]); + + const result = await Topics.post({ title: 'banned topic', content: 'tttttttttttt', cid: cid, uid: testUid }); + assert(result); + assert.strictEqual(result.topicData.title, 'banned topic'); + }); }); describe('Digest.getSubscribers', () => { @@ -1899,7 +1926,7 @@ describe('User', () => { it('should get unread count for user', async () => { const count = await socketUser.getUnreadCount({ uid: testUid }); - assert.strictEqual(count, 2); + assert.strictEqual(count, 3); }); it('should get unread chat count 0 for guest', async () => { @@ -1922,15 +1949,15 @@ describe('User', () => { assert.deepStrictEqual(counts, { unreadChatCount: 0, unreadCounts: { - '': 2, - new: 2, - unreplied: 2, + '': 3, + new: 3, + unreplied: 3, watched: 0, }, - unreadNewTopicCount: 2, + unreadNewTopicCount: 3, unreadNotificationCount: 0, - unreadTopicCount: 2, - unreadUnrepliedTopicCount: 2, + unreadTopicCount: 3, + unreadUnrepliedTopicCount: 3, unreadWatchedTopicCount: 0, }); }); From e0b9240d12fb1a88d9bfe66d1d3851a7ed493cc1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Nov 2022 08:50:42 -0500 Subject: [PATCH 129/150] fix(deps): update dependency ace-builds to v1.13.1 (#11045) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index c2a1485066..b5231a24fd 100644 --- a/install/package.json +++ b/install/package.json @@ -30,7 +30,7 @@ "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", "@isaacs/ttlcache": "1.2.1", - "ace-builds": "1.13.0", + "ace-builds": "1.13.1", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.13", From 07c81d5db83aa73107a6132b960dd1af9bd544ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Nov 2022 08:50:50 -0500 Subject: [PATCH 130/150] chore(deps): update dependency eslint-config-nodebb to v0.2.1 (#11043) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index b5231a24fd..344a5de87e 100644 --- a/install/package.json +++ b/install/package.json @@ -153,7 +153,7 @@ "@commitlint/config-angular": "17.2.0", "coveralls": "3.1.1", "eslint": "8.27.0", - "eslint-config-nodebb": "0.1.1", + "eslint-config-nodebb": "0.2.1", "eslint-plugin-import": "2.26.0", "grunt": "1.5.3", "grunt-contrib-watch": "1.1.0", From ca162c0407e3b7b4b28ac89a21d9c22ef1c68d64 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Nov 2022 08:51:31 -0500 Subject: [PATCH 131/150] fix(deps): update dependency connect-pg-simple to v8 (#11033) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 344a5de87e..b9ba77c88b 100644 --- a/install/package.json +++ b/install/package.json @@ -50,7 +50,7 @@ "connect-flash": "0.1.1", "connect-mongo": "4.6.0", "connect-multiparty": "2.2.0", - "connect-pg-simple": "7.0.0", + "connect-pg-simple": "8.0.0", "connect-redis": "6.1.3", "cookie-parser": "1.4.6", "cron": "2.1.0", From 5aaebdd3d7dcd970369c1e6e6157449a397b9a3c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 16 Nov 2022 12:13:07 -0500 Subject: [PATCH 132/150] fix: #10877, define a resolution for jquery subdependency of timeago --- install/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install/package.json b/install/package.json index 2425804386..95086f397c 100644 --- a/install/package.json +++ b/install/package.json @@ -166,6 +166,9 @@ "nyc": "15.1.0", "smtp-server": "3.11.0" }, + "resolutions": { + "timeago/jquery": "3.6.0" + }, "bugs": { "url": "https://github.com/NodeBB/NodeBB/issues" }, From a87f64b4bb9246f5548abf4c11afdb595baa6f3e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 18 Nov 2022 11:54:08 -0500 Subject: [PATCH 133/150] fix: pin jquery version for all packages that include it as a subdependency --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 95086f397c..da2a0c6c61 100644 --- a/install/package.json +++ b/install/package.json @@ -167,7 +167,7 @@ "smtp-server": "3.11.0" }, "resolutions": { - "timeago/jquery": "3.6.0" + "*/jquery": "3.6.0" }, "bugs": { "url": "https://github.com/NodeBB/NodeBB/issues" @@ -192,4 +192,4 @@ "url": "https://github.com/barisusakli" } ] -} \ No newline at end of file +} From c2d19d7f0a9abbbe39bff82cbaddff014004dba5 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sat, 19 Nov 2022 09:05:57 +0000 Subject: [PATCH 134/150] Latest translations and fallbacks --- public/language/bg/admin/settings/advanced.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/bg/admin/settings/advanced.json b/public/language/bg/admin/settings/advanced.json index b154c9b8b5..ee615720d9 100644 --- a/public/language/bg/admin/settings/advanced.json +++ b/public/language/bg/admin/settings/advanced.json @@ -3,7 +3,7 @@ "maintenance-mode.help": "Когато форумът е в режим на профилактика, всички заявки ще бъдат пренасочвани към статична страница за изчакване, с изключение на администраторите, които ще могат да използват уеб сайта нормално.", "maintenance-mode.status": "Код на състоянието за режима на профилактика", "maintenance-mode.message": "Съобщение за профилактиката", - "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Изберете групи, които да бъдат изключени от режима на профилактика", "headers": "Заглавни части", "headers.allow-from": "Задайте „ALLOW-FROM“, за да поставите NodeBB в „iFrame“", "headers.csp-frame-ancestors": "Задайте заглавката „Content-Security-Policy frame-ancestors“ за да поставите NodeBB „iFrame“", From de640e23e53d71b4450d0979d0599747afacb2cf Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sun, 20 Nov 2022 09:06:00 +0000 Subject: [PATCH 135/150] Latest translations and fallbacks --- public/language/fr/admin/settings/advanced.json | 2 +- public/language/vi/admin/settings/advanced.json | 2 +- public/language/vi/admin/settings/email.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/fr/admin/settings/advanced.json b/public/language/fr/admin/settings/advanced.json index 4f97ce90cb..e9f5143c69 100644 --- a/public/language/fr/admin/settings/advanced.json +++ b/public/language/fr/admin/settings/advanced.json @@ -3,7 +3,7 @@ "maintenance-mode.help": "Quand le forum est en mode maintenance, toutes les requêtes sont redirigées vers une page de garde statique. Les administrateurs sont exemptés de cette redirection et peuvent accéder normalement au site. ", "maintenance-mode.status": "Mode maintenance", "maintenance-mode.message": "Message de maintenance", - "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Sélectionner les groupes qui doivent être exemptés du mode maintenance", "headers": "En-têtes", "headers.allow-from": "Définissez ALLOW-FROM pour afficher NodeBB dans un iFrame", "headers.csp-frame-ancestors": "Définir la politique de sécurité pour pouvoir intégrer des iframes", diff --git a/public/language/vi/admin/settings/advanced.json b/public/language/vi/admin/settings/advanced.json index 5455bcbe6c..baee1b5a06 100644 --- a/public/language/vi/admin/settings/advanced.json +++ b/public/language/vi/admin/settings/advanced.json @@ -3,7 +3,7 @@ "maintenance-mode.help": "Khi diễn đàn ở chế độ bảo trì, tất cả các yêu cầu sẽ được chuyển hướng đến một trang giữ tĩnh. Quản trị viên không bị chuyển hướng này và có thể truy cập trang bình thường.", "maintenance-mode.status": "Mã Trạng Thái Chế Độ Bảo Trì", "maintenance-mode.message": "Thông Báo Bảo Trì", - "maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode", + "maintenance-mode.groups-exempt-from-maintenance-mode": "Chọn các nhóm nên được miễn chế độ bảo trì", "headers": "Headers", "headers.allow-from": "Đặt ALLOW-FROM để đặt NodeBB trong iFrame", "headers.csp-frame-ancestors": "Đặt giá trị Content-Security-Policy frame-ancestors ở phần đầu trang để Đặt NodeBB trong iFrame", diff --git a/public/language/vi/admin/settings/email.json b/public/language/vi/admin/settings/email.json index a1854f39a0..cdd5a01772 100644 --- a/public/language/vi/admin/settings/email.json +++ b/public/language/vi/admin/settings/email.json @@ -5,7 +5,7 @@ "from": "Tên Người Gửi", "from-help": "Tên người gửi hiển thị trong email.", - "confirmation-settings": "Confirmation", + "confirmation-settings": "Xác nhận", "confirmation.expiry": "Hours to keep email confirmation link valid", "smtp-transport": "Truyền Tải SMTP", From bb82eb71e23533678af92e014962f273c85db2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 21 Nov 2022 13:37:35 -0500 Subject: [PATCH 136/150] fix: #11052, add missing await --- src/posts/delete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/posts/delete.js b/src/posts/delete.js index 900d0c717c..fb285b5128 100644 --- a/src/posts/delete.js +++ b/src/posts/delete.js @@ -203,7 +203,7 @@ module.exports = function (Posts) { await Promise.all(promises); const parentPids = _.uniq(postsWithParents.map(p => p.toPid)); - const counts = db.sortedSetsCard(parentPids.map(pid => `pid:${pid}:replies`)); + const counts = await db.sortedSetsCard(parentPids.map(pid => `pid:${pid}:replies`)); await db.setObjectBulk(parentPids.map((pid, index) => [`post:${pid}`, { replies: counts[index] }])); } From 59b4d95f9193630d71af7d01bb4da21d62cd0f54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:09:48 -0500 Subject: [PATCH 137/150] fix(deps): update dependency mongodb to v4.12.0 (#11049) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index f738aa638d..bcdeeb47bd 100644 --- a/install/package.json +++ b/install/package.json @@ -83,7 +83,7 @@ "material-design-lite": "1.3.0", "mime": "3.0.0", "mkdirp": "1.0.4", - "mongodb": "4.11.0", + "mongodb": "4.12.0", "morgan": "1.10.0", "mousetrap": "1.6.5", "multiparty": "4.2.3", From 62a60cbf17842f4c983d75dc1a057479a22c8677 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:11:03 -0500 Subject: [PATCH 138/150] fix(deps): update dependency nodebb-plugin-markdown to v10.1.1 (#11047) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index bcdeeb47bd..be1ace4b7e 100644 --- a/install/package.json +++ b/install/package.json @@ -94,7 +94,7 @@ "nodebb-plugin-dbsearch": "5.1.5", "nodebb-plugin-emoji": "4.0.6", "nodebb-plugin-emoji-android": "3.0.0", - "nodebb-plugin-markdown": "10.1.0", + "nodebb-plugin-markdown": "10.1.1", "nodebb-plugin-mentions": "3.0.12", "nodebb-plugin-spam-be-gone": "1.0.2", "nodebb-rewards-essentials": "0.2.1", From 6611d44c6904cd79ae18b38780f122aa57174da1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:16:22 -0500 Subject: [PATCH 139/150] chore(deps): update dependency jquery to v3.6.1 (#11048) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index be1ace4b7e..fdd1ba5eaf 100644 --- a/install/package.json +++ b/install/package.json @@ -167,7 +167,7 @@ "smtp-server": "3.11.0" }, "resolutions": { - "*/jquery": "3.6.0" + "*/jquery": "3.6.1" }, "bugs": { "url": "https://github.com/NodeBB/NodeBB/issues" From 13f3a0481942b36b29d1691b726d641487cfbd35 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:36:55 -0500 Subject: [PATCH 140/150] fix(deps): update dependency cropperjs to v1.5.13 (#11055) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index fdd1ba5eaf..02ea44e324 100644 --- a/install/package.json +++ b/install/package.json @@ -54,7 +54,7 @@ "connect-redis": "6.1.3", "cookie-parser": "1.4.6", "cron": "2.1.0", - "cropperjs": "1.5.12", + "cropperjs": "1.5.13", "csurf": "1.11.0", "daemon": "1.1.0", "diff": "5.1.0", From 5750ded157003060b1dfc13576f1d098448dc9a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 18:38:51 -0500 Subject: [PATCH 141/150] chore(deps): update dependency jsdom to v20.0.3 (#11054) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 02ea44e324..1f0b1a5eaf 100644 --- a/install/package.json +++ b/install/package.json @@ -158,7 +158,7 @@ "grunt": "1.5.3", "grunt-contrib-watch": "1.1.0", "husky": "8.0.2", - "jsdom": "20.0.2", + "jsdom": "20.0.3", "lint-staged": "13.0.3", "mocha": "10.1.0", "mocha-lcov-reporter": "1.3.0", From 18eb35a173e1208f5228f8ecb1292f5265d7b961 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 18:41:07 -0500 Subject: [PATCH 142/150] fix(deps): update dependency nodebb-theme-persona to v12.1.12 (#11057) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 1f0b1a5eaf..90f4826bbd 100644 --- a/install/package.json +++ b/install/package.json @@ -99,7 +99,7 @@ "nodebb-plugin-spam-be-gone": "1.0.2", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", - "nodebb-theme-persona": "12.1.11", + "nodebb-theme-persona": "12.1.12", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.19", "nodebb-widget-essentials": "6.0.0", From d480f26b2fcb65de16cac8821539463d65f7f0c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 19:36:57 -0500 Subject: [PATCH 143/150] chore(deps): update dependency eslint to v8.28.0 (#11059) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 90f4826bbd..d5dbceff2b 100644 --- a/install/package.json +++ b/install/package.json @@ -152,7 +152,7 @@ "@commitlint/cli": "17.2.0", "@commitlint/config-angular": "17.2.0", "coveralls": "3.1.1", - "eslint": "8.27.0", + "eslint": "8.28.0", "eslint-config-nodebb": "0.2.1", "eslint-plugin-import": "2.26.0", "grunt": "1.5.3", From d449710e952989dc1eb53412bc03babd9a3211e5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 19:37:06 -0500 Subject: [PATCH 144/150] fix(deps): update dependency esbuild to v0.15.15 (#11056) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index d5dbceff2b..29c7489771 100644 --- a/install/package.json +++ b/install/package.json @@ -58,7 +58,7 @@ "csurf": "1.11.0", "daemon": "1.1.0", "diff": "5.1.0", - "esbuild": "0.15.14", + "esbuild": "0.15.15", "express": "4.18.2", "express-session": "1.17.3", "express-useragent": "1.0.15", From f47842056948f2f38ca3f852f831032b03b8e8c7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 19:37:19 -0500 Subject: [PATCH 145/150] chore(deps): update commitlint monorepo to v17.3.0 (#11058) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 29c7489771..c9d55c5e29 100644 --- a/install/package.json +++ b/install/package.json @@ -149,8 +149,8 @@ }, "devDependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@commitlint/cli": "17.2.0", - "@commitlint/config-angular": "17.2.0", + "@commitlint/cli": "17.3.0", + "@commitlint/config-angular": "17.3.0", "coveralls": "3.1.1", "eslint": "8.28.0", "eslint-config-nodebb": "0.2.1", From 709ca59db2272b56cef791b5591f8b70e34ccfb1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Nov 2022 17:56:40 -0500 Subject: [PATCH 146/150] fix(deps): update socket.io packages to v4.5.4 (#11061) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index c9d55c5e29..bc1aa5d2c4 100644 --- a/install/package.json +++ b/install/package.json @@ -125,8 +125,8 @@ "sharp": "0.31.2", "sitemap": "7.1.1", "slideout": "1.0.1", - "socket.io": "4.5.3", - "socket.io-client": "4.5.3", + "socket.io": "4.5.4", + "socket.io-client": "4.5.4", "@socket.io/redis-adapter": "7.2.0", "sortablejs": "1.15.0", "spdx-license-list": "6.6.0", From fc49665fe58150fb0d7269ea0e348e29e29410ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 22 Nov 2022 19:30:58 -0500 Subject: [PATCH 147/150] fix: https://github.com/NodeBB-Community/nodebb-plugin-custom-pages/issues/68 don't crash if template doesn't have any widgets set before --- src/widgets/index.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/widgets/index.js b/src/widgets/index.js index 686c309e7b..473a33a820 100644 --- a/src/widgets/index.js +++ b/src/widgets/index.js @@ -212,11 +212,13 @@ widgets.reset = async function () { widgets.resetTemplate = async function (template) { const area = await db.getObject(`widgets:${template}.tpl`); - const toBeDrafted = _.flatMap(Object.values(area), value => JSON.parse(value)); - await db.delete(`widgets:${template}.tpl`); - let draftWidgets = await db.getObjectField('widgets:global', 'drafts'); - draftWidgets = JSON.parse(draftWidgets).concat(toBeDrafted); - await db.setObjectField('widgets:global', 'drafts', JSON.stringify(draftWidgets)); + if (area) { + const toBeDrafted = _.flatMap(Object.values(area), value => JSON.parse(value)); + await db.delete(`widgets:${template}.tpl`); + let draftWidgets = await db.getObjectField('widgets:global', 'drafts'); + draftWidgets = JSON.parse(draftWidgets).concat(toBeDrafted); + await db.setObjectField('widgets:global', 'drafts', JSON.stringify(draftWidgets)); + } }; widgets.resetTemplates = async function (templates) { From 110311b25ee2a194ad5ebc39e427096f0f77e8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 22 Nov 2022 19:30:58 -0500 Subject: [PATCH 148/150] fix: https://github.com/NodeBB-Community/nodebb-plugin-custom-pages/issues/68 don't crash if template doesn't have any widgets set before --- src/widgets/index.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/widgets/index.js b/src/widgets/index.js index 686c309e7b..473a33a820 100644 --- a/src/widgets/index.js +++ b/src/widgets/index.js @@ -212,11 +212,13 @@ widgets.reset = async function () { widgets.resetTemplate = async function (template) { const area = await db.getObject(`widgets:${template}.tpl`); - const toBeDrafted = _.flatMap(Object.values(area), value => JSON.parse(value)); - await db.delete(`widgets:${template}.tpl`); - let draftWidgets = await db.getObjectField('widgets:global', 'drafts'); - draftWidgets = JSON.parse(draftWidgets).concat(toBeDrafted); - await db.setObjectField('widgets:global', 'drafts', JSON.stringify(draftWidgets)); + if (area) { + const toBeDrafted = _.flatMap(Object.values(area), value => JSON.parse(value)); + await db.delete(`widgets:${template}.tpl`); + let draftWidgets = await db.getObjectField('widgets:global', 'drafts'); + draftWidgets = JSON.parse(draftWidgets).concat(toBeDrafted); + await db.setObjectField('widgets:global', 'drafts', JSON.stringify(draftWidgets)); + } }; widgets.resetTemplates = async function (templates) { From 864fe0f9711897623495440968e6a5b94180cfc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 23 Nov 2022 11:33:00 -0500 Subject: [PATCH 149/150] feat: add permissions-policy header --- public/language/en-GB/admin/settings/advanced.json | 2 ++ src/middleware/headers.js | 4 ++++ src/views/admin/settings/advanced.tpl | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/public/language/en-GB/admin/settings/advanced.json b/public/language/en-GB/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/en-GB/admin/settings/advanced.json +++ b/public/language/en-GB/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/src/middleware/headers.js b/src/middleware/headers.js index 7f05f11928..f6aaecd3e8 100644 --- a/src/middleware/headers.js +++ b/src/middleware/headers.js @@ -57,6 +57,10 @@ module.exports = function (middleware) { }); } + if (meta.config['permissions-policy']) { + headers['Permissions-Policy'] = meta.config['permissions-policy']; + } + if (meta.config['access-control-allow-credentials']) { headers['Access-Control-Allow-Credentials'] = meta.config['access-control-allow-credentials']; } diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl index 83d010ad63..1041848878 100644 --- a/src/views/admin/settings/advanced.tpl +++ b/src/views/admin/settings/advanced.tpl @@ -99,6 +99,12 @@
      + +
      + + +

      [[admin/settings/advanced:headers.permissions-policy-help]]

      +
      From 1d7dbf1480d4f82885df5e7325c77f27f2ed8d9c Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 23 Nov 2022 16:33:45 +0000 Subject: [PATCH 150/150] chore(i18n): fallback strings for new resources: nodebb.admin-settings-advanced --- public/language/ar/admin/settings/advanced.json | 2 ++ public/language/bg/admin/settings/advanced.json | 2 ++ public/language/bn/admin/settings/advanced.json | 2 ++ public/language/cs/admin/settings/advanced.json | 2 ++ public/language/da/admin/settings/advanced.json | 2 ++ public/language/de/admin/settings/advanced.json | 2 ++ public/language/el/admin/settings/advanced.json | 2 ++ public/language/en-US/admin/settings/advanced.json | 2 ++ public/language/en-x-pirate/admin/settings/advanced.json | 2 ++ public/language/es/admin/settings/advanced.json | 2 ++ public/language/et/admin/settings/advanced.json | 2 ++ public/language/fa-IR/admin/settings/advanced.json | 2 ++ public/language/fi/admin/settings/advanced.json | 2 ++ public/language/fr/admin/settings/advanced.json | 2 ++ public/language/gl/admin/settings/advanced.json | 2 ++ public/language/he/admin/settings/advanced.json | 2 ++ public/language/hr/admin/settings/advanced.json | 2 ++ public/language/hu/admin/settings/advanced.json | 2 ++ public/language/id/admin/settings/advanced.json | 2 ++ public/language/it/admin/settings/advanced.json | 2 ++ public/language/ja/admin/settings/advanced.json | 2 ++ public/language/ko/admin/settings/advanced.json | 2 ++ public/language/lt/admin/settings/advanced.json | 2 ++ public/language/lv/admin/settings/advanced.json | 2 ++ public/language/ms/admin/settings/advanced.json | 2 ++ public/language/nb/admin/settings/advanced.json | 2 ++ public/language/nl/admin/settings/advanced.json | 2 ++ public/language/pl/admin/settings/advanced.json | 2 ++ public/language/pt-BR/admin/settings/advanced.json | 2 ++ public/language/pt-PT/admin/settings/advanced.json | 2 ++ public/language/ro/admin/settings/advanced.json | 2 ++ public/language/ru/admin/settings/advanced.json | 2 ++ public/language/rw/admin/settings/advanced.json | 2 ++ public/language/sc/admin/settings/advanced.json | 2 ++ public/language/sk/admin/settings/advanced.json | 2 ++ public/language/sl/admin/settings/advanced.json | 2 ++ public/language/sq-AL/admin/settings/advanced.json | 2 ++ public/language/sr/admin/settings/advanced.json | 2 ++ public/language/sv/admin/settings/advanced.json | 2 ++ public/language/th/admin/settings/advanced.json | 2 ++ public/language/tr/admin/settings/advanced.json | 2 ++ public/language/uk/admin/settings/advanced.json | 2 ++ public/language/vi/admin/settings/advanced.json | 2 ++ public/language/zh-CN/admin/settings/advanced.json | 2 ++ public/language/zh-TW/admin/settings/advanced.json | 2 ++ 45 files changed, 90 insertions(+) diff --git a/public/language/ar/admin/settings/advanced.json b/public/language/ar/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/ar/admin/settings/advanced.json +++ b/public/language/ar/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/bg/admin/settings/advanced.json b/public/language/bg/admin/settings/advanced.json index ee615720d9..32caf79de0 100644 --- a/public/language/bg/admin/settings/advanced.json +++ b/public/language/bg/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "Когато е включено (по подразбиране), стойността на заглавката ще бъде require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Стриктна транспортна сигурност", "hsts.enabled": "Включване на HSTS (препоръчително)", "hsts.maxAge": "Максимална възраст на HSTS", diff --git a/public/language/bn/admin/settings/advanced.json b/public/language/bn/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/bn/admin/settings/advanced.json +++ b/public/language/bn/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/cs/admin/settings/advanced.json b/public/language/cs/admin/settings/advanced.json index d5c6befa77..bc10146c76 100644 --- a/public/language/cs/admin/settings/advanced.json +++ b/public/language/cs/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Přísné zabezpečení přenosu", "hsts.enabled": "Povolit HSTS (doporučeno)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/da/admin/settings/advanced.json b/public/language/da/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/da/admin/settings/advanced.json +++ b/public/language/da/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/de/admin/settings/advanced.json b/public/language/de/admin/settings/advanced.json index 6d6e0005f5..1f75026bc5 100644 --- a/public/language/de/admin/settings/advanced.json +++ b/public/language/de/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "Wenn aktiviert (Standard), wird der Header auf require-corp gesetzt", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "HSTS Aktivieren (empfohlen)", "hsts.maxAge": "HSTS Maximales Alter", diff --git a/public/language/el/admin/settings/advanced.json b/public/language/el/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/el/admin/settings/advanced.json +++ b/public/language/el/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/en-US/admin/settings/advanced.json b/public/language/en-US/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/en-US/admin/settings/advanced.json +++ b/public/language/en-US/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/en-x-pirate/admin/settings/advanced.json b/public/language/en-x-pirate/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/en-x-pirate/admin/settings/advanced.json +++ b/public/language/en-x-pirate/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/es/admin/settings/advanced.json b/public/language/es/admin/settings/advanced.json index 8efe29570f..4c912b4d14 100644 --- a/public/language/es/admin/settings/advanced.json +++ b/public/language/es/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Seguridad estricta del transporte", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/et/admin/settings/advanced.json b/public/language/et/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/et/admin/settings/advanced.json +++ b/public/language/et/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/fa-IR/admin/settings/advanced.json b/public/language/fa-IR/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/fa-IR/admin/settings/advanced.json +++ b/public/language/fa-IR/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/fi/admin/settings/advanced.json b/public/language/fi/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/fi/admin/settings/advanced.json +++ b/public/language/fi/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/fr/admin/settings/advanced.json b/public/language/fr/admin/settings/advanced.json index e9f5143c69..13058af0d3 100644 --- a/public/language/fr/admin/settings/advanced.json +++ b/public/language/fr/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "Lorsqu'il est activé (par défaut), définira l'en-tête sur require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Activer HSTS (recommandé)", "hsts.maxAge": "HSTS Age Max", diff --git a/public/language/gl/admin/settings/advanced.json b/public/language/gl/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/gl/admin/settings/advanced.json +++ b/public/language/gl/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/he/admin/settings/advanced.json b/public/language/he/admin/settings/advanced.json index dab98f1f59..7be6b15566 100644 --- a/public/language/he/admin/settings/advanced.json +++ b/public/language/he/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "הפעל HSTS (מומלץ)", "hsts.maxAge": "גיל כותרת HSTS", diff --git a/public/language/hr/admin/settings/advanced.json b/public/language/hr/admin/settings/advanced.json index dd015e7caf..cdf6f454c4 100644 --- a/public/language/hr/admin/settings/advanced.json +++ b/public/language/hr/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/hu/admin/settings/advanced.json b/public/language/hu/admin/settings/advanced.json index fce398dceb..24a7537fe3 100644 --- a/public/language/hu/admin/settings/advanced.json +++ b/public/language/hu/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Szigorú HTTP biztonság (HSTS)", "hsts.enabled": "Szigorú HTTP biztonság (HSTS) bekapcsolása (ajánlott)", "hsts.maxAge": "HSTS maximális kora", diff --git a/public/language/id/admin/settings/advanced.json b/public/language/id/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/id/admin/settings/advanced.json +++ b/public/language/id/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/it/admin/settings/advanced.json b/public/language/it/admin/settings/advanced.json index 0f1df9e192..23de6ede5e 100644 --- a/public/language/it/admin/settings/advanced.json +++ b/public/language/it/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "Se abilitato (impostazione predefinita), imposterà l'intestazione su require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Rigorosa sicurezza trasporto", "hsts.enabled": "Abilita HSTS (consigliato)", "hsts.maxAge": "Età massima HSTS", diff --git a/public/language/ja/admin/settings/advanced.json b/public/language/ja/admin/settings/advanced.json index 999219c902..72ad0891bf 100644 --- a/public/language/ja/admin/settings/advanced.json +++ b/public/language/ja/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/ko/admin/settings/advanced.json b/public/language/ko/admin/settings/advanced.json index 99d1df901f..9d6966eab9 100644 --- a/public/language/ko/admin/settings/advanced.json +++ b/public/language/ko/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "HSTS 활성화 (권장)", "hsts.maxAge": "HSTS 유효 기간", diff --git a/public/language/lt/admin/settings/advanced.json b/public/language/lt/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/lt/admin/settings/advanced.json +++ b/public/language/lt/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/lv/admin/settings/advanced.json b/public/language/lv/admin/settings/advanced.json index abe27d1cea..1899c0dd8f 100644 --- a/public/language/lv/admin/settings/advanced.json +++ b/public/language/lv/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "HTTP Strict Transport Security (HSTS)", "hsts.enabled": "Iespējots HSTS (ieteicams)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/ms/admin/settings/advanced.json b/public/language/ms/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/ms/admin/settings/advanced.json +++ b/public/language/ms/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/nb/admin/settings/advanced.json b/public/language/nb/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/nb/admin/settings/advanced.json +++ b/public/language/nb/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/nl/admin/settings/advanced.json b/public/language/nl/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/nl/admin/settings/advanced.json +++ b/public/language/nl/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/pl/admin/settings/advanced.json b/public/language/pl/admin/settings/advanced.json index 8e22b66403..619e26b8de 100644 --- a/public/language/pl/admin/settings/advanced.json +++ b/public/language/pl/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Włączony HSTS (zalecane)", "hsts.maxAge": "Maksymalny wiek HSTS", diff --git a/public/language/pt-BR/admin/settings/advanced.json b/public/language/pt-BR/admin/settings/advanced.json index 51e6ef17d3..84d1f48c6f 100644 --- a/public/language/pt-BR/admin/settings/advanced.json +++ b/public/language/pt-BR/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Habilitar HSTS (recomendado)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/pt-PT/admin/settings/advanced.json b/public/language/pt-PT/admin/settings/advanced.json index 81de9f21e5..5b01a7fefd 100644 --- a/public/language/pt-PT/admin/settings/advanced.json +++ b/public/language/pt-PT/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/ro/admin/settings/advanced.json b/public/language/ro/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/ro/admin/settings/advanced.json +++ b/public/language/ro/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/ru/admin/settings/advanced.json b/public/language/ru/admin/settings/advanced.json index f426df26d4..caf3bd0ef3 100644 --- a/public/language/ru/admin/settings/advanced.json +++ b/public/language/ru/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Строгая политика безопасности транспортного уровня", "hsts.enabled": "Включить HSTS (рекомендуется)", "hsts.maxAge": "Срок действия заголовка HSTS", diff --git a/public/language/rw/admin/settings/advanced.json b/public/language/rw/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/rw/admin/settings/advanced.json +++ b/public/language/rw/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/sc/admin/settings/advanced.json b/public/language/sc/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/sc/admin/settings/advanced.json +++ b/public/language/sc/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/sk/admin/settings/advanced.json b/public/language/sk/admin/settings/advanced.json index 95a77ab4dc..a464b384da 100644 --- a/public/language/sk/admin/settings/advanced.json +++ b/public/language/sk/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Prísne zabezpečenie prenosu", "hsts.enabled": "Povoliť HSTS (odporúčané)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/sl/admin/settings/advanced.json b/public/language/sl/admin/settings/advanced.json index f899857086..ab1242a9b4 100644 --- a/public/language/sl/admin/settings/advanced.json +++ b/public/language/sl/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Omogočen HSTS (priporočeno)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/sq-AL/admin/settings/advanced.json b/public/language/sq-AL/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/sq-AL/admin/settings/advanced.json +++ b/public/language/sq-AL/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/sr/admin/settings/advanced.json b/public/language/sr/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/sr/admin/settings/advanced.json +++ b/public/language/sr/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/sv/admin/settings/advanced.json b/public/language/sv/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/sv/admin/settings/advanced.json +++ b/public/language/sv/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/th/admin/settings/advanced.json b/public/language/th/admin/settings/advanced.json index 1bf35d7370..982eaa2f64 100644 --- a/public/language/th/admin/settings/advanced.json +++ b/public/language/th/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/tr/admin/settings/advanced.json b/public/language/tr/admin/settings/advanced.json index c9fab4313d..84fc2f5ad5 100644 --- a/public/language/tr/admin/settings/advanced.json +++ b/public/language/tr/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "Etkinleştirildiğinde (varsayılan), başlığı require-corp olarak ayarlayacaktır.", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin Kaynak Politikası", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "STS", "hsts.enabled": "HSTS'yi etkinleştir (önerilir)", "hsts.maxAge": "HSTS Maksimum Yaş", diff --git a/public/language/uk/admin/settings/advanced.json b/public/language/uk/admin/settings/advanced.json index abff8ca55f..58e45a1bfb 100644 --- a/public/language/uk/admin/settings/advanced.json +++ b/public/language/uk/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Strict Transport Security", "hsts.enabled": "Enabled HSTS (recommended)", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/vi/admin/settings/advanced.json b/public/language/vi/admin/settings/advanced.json index baee1b5a06..4f4b14039f 100644 --- a/public/language/vi/admin/settings/advanced.json +++ b/public/language/vi/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "Khi được bật (mặc định), sẽ đặt tiêu đề thành require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "Bảo Vệ Truyền Tải Nghiêm Ngặt", "hsts.enabled": "Đã bật HSTS (đề nghị)", "hsts.maxAge": "HSTS Tuổi Tối Đa", diff --git a/public/language/zh-CN/admin/settings/advanced.json b/public/language/zh-CN/admin/settings/advanced.json index 1ebb76d2ba..45a12d552a 100644 --- a/public/language/zh-CN/admin/settings/advanced.json +++ b/public/language/zh-CN/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "严格安全传输（HSTS）", "hsts.enabled": "启用HSTS（推荐）", "hsts.maxAge": "HSTS Max Age", diff --git a/public/language/zh-TW/admin/settings/advanced.json b/public/language/zh-TW/admin/settings/advanced.json index 63ca8cbe3f..454475cb71 100644 --- a/public/language/zh-TW/admin/settings/advanced.json +++ b/public/language/zh-TW/admin/settings/advanced.json @@ -20,6 +20,8 @@ "headers.coep-help": "When enabled (default), will set the header to require-corp", "headers.coop": "Cross-Origin-Opener-Policy", "headers.corp": "Cross-Origin-Resource-Policy", + "headers.permissions-policy": "Permissions-Policy", + "headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see this for more info.", "hsts": "嚴格安全傳輸", "hsts.enabled": "啟用HSTS（推薦）", "hsts.maxAge": "HSTS Max Age",