From 28efcb59cbcd301424f58dffeb6e86a0f213095a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 27 Oct 2021 12:35:10 -0400 Subject: [PATCH 01/95] chore: remove .opacity() mixin as it is supported cross-browser --- install/package.json | 4 ++-- public/less/generics.less | 2 +- public/less/mixins.less | 7 ------- src/meta/minifier.js | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/install/package.json b/install/package.json index 61ef2eece4..3dd20a53be 100644 --- a/install/package.json +++ b/install/package.json @@ -93,9 +93,9 @@ "nodebb-plugin-spam-be-gone": "0.7.10", "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.2.1", - "nodebb-theme-persona": "11.2.19", + "nodebb-theme-persona": "11.2.20", "nodebb-theme-slick": "1.4.14", - "nodebb-theme-vanilla": "12.1.7", + "nodebb-theme-vanilla": "12.1.8", "nodebb-widget-essentials": "5.0.4", "nodemailer": "^6.5.0", "nprogress": "0.2.0", diff --git a/public/less/generics.less b/public/less/generics.less index 81ffd073ca..d7cd2b3ec3 100644 --- a/public/less/generics.less +++ b/public/less/generics.less @@ -39,7 +39,7 @@ &.disabled { background-color: #888!important; - .opacity(0.5); + opacity: 0.5; } } } diff --git a/public/less/mixins.less b/public/less/mixins.less index 57a54ea32b..04259bb089 100644 --- a/public/less/mixins.less +++ b/public/less/mixins.less @@ -32,13 +32,6 @@ } } -.opacity(@opacity: 1) { - -moz-opacity: @opacity; - opacity: @opacity; - -ms-filter: ~`"progid:DXImageTransform.Microsoft.Alpha(opacity=(" + "@{opacity}" * 100 + "))"`; - filter: ~`"alpha(opacity = (" + "@{opacity}" * 100 + "))"`; -} - .border-radius (@radius: 5px) { -webkit-border-radius: @radius; -moz-border-radius: @radius; diff --git a/src/meta/minifier.js b/src/meta/minifier.js index f388b3159e..cfb740755f 100644 --- a/src/meta/minifier.js +++ b/src/meta/minifier.js @@ -228,7 +228,7 @@ Minifier.js.minifyBatch = async function (scripts, fork) { actions.buildCSS = async function buildCSS(data) { const lessOutput = await less.render(data.source, { paths: data.paths, - javascriptEnabled: true, + javascriptEnabled: false, }); const postcssArgs = [autoprefixer]; From 82eda23a9ef2ae2cf5f0cf75eda1800d6302e04e Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 27 Oct 2021 16:47:59 +0000 Subject: [PATCH 02/95] chore: update changelog for v1.18.5 --- CHANGELOG.md | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a505089cd5..e339ad70ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,162 @@ +#### v1.18.5 (2021-10-27) + +##### Breaking Changes + +* disable javascript in custom less tab (719cfc0d) + +##### Chores + +* remove .opacity() mixin as it is supported cross-browser (28efcb59) +* up themes (463b2076) +* up persona (1438f409) +* incrementing version number - v1.18.4 (945c2b0b) +* update changelog for v1.18.4 (7cbcb521) +* **deps:** + * update dependency lint-staged to v11.2.6 (8d4bb8bb) + * update dependency lint-staged to v11.2.5 (0728a994) + * update dependency lint-staged to v11.2.4 (f76a7882) + * update dependency husky to v7.0.4 (2a3e13f3) + * update dependency mocha to v9.1.3 (4784f016) + * update dependency eslint-plugin-import to v2.25.2 (3c3f45d9) + * update dependency jsdom to v18 (4b8dcd4c) + * update dependency eslint-plugin-import to v2.25.1 (7c4aebbd) + * update dependency lint-staged to v11.2.3 (288b5456) + * update dependency lint-staged to v11.2.2 (f96c8c4d) + * update dependency @commitlint/cli to v13.2.1 (52c38a1d) + * update dependency lint-staged to v11.2.1 (022e8df0) + * update dependency eslint-config-nodebb to v0.0.3 (4b92df82) +* **i18n:** + * fallback strings for new resources: nodebb.admin-settings-email, nodebb.error (9b68dc37) + * fallback strings for new resources: nodebb.admin-dashboard (ff962b5d) + * fallback strings for new resources: nodebb.admin-dashboard, nodebb.admin-menu (abe59131) + * fallback strings for new resources: nodebb.admin-manage-digest, nodebb.admin-settings-user, nodebb.user (2bed40be) + +##### Documentation Changes + +* update verbiage re: login API route (94c4f87b) + +##### New Features + +* new ACP option `emailPrompt` ... which allows administrators to disable the client-side prompt to encourage users to enter or confirm their email addresses (80ea12c1) +* show popular searches (f4cf482a) +* new plugin hook to allow plugins to reject email address on new registration or email change (6b4f35c2) +* utilities login API route now starts an actual login session, if requested (806a1e50) +* add method name to deprecation message (b91ae088) +* quote tooltip (66fca4e0) +* additional quality options for jpeg uploads, added quality and compression settings for png uploads (d22b076b) +* #8053, biweekly digest option (f7967bdf) +* core submit button dropdown (605a5381) +* added failing i18n tests (35af7634) +* confirm before deleting all events (#9875) (56d05b4e) + +##### Bug Fixes + +* **deps:** + * update dependency nodebb-theme-vanilla to v12.1.7 (#9944) (bf20965f) + * update dependency nodebb-theme-persona to v11.2.19 (#9943) (bcf85fcf) + * update dependency nodebb-rewards-essentials to v0.2.0 (7c2ecb12) + * update dependency nodebb-theme-vanilla to v12.1.6 (49b8b983) + * update dependency nodebb-theme-persona to v11.2.18 (ed0adf2c) + * update dependency nodebb-theme-persona to v11.2.17 (78661079) + * update dependency postcss to v8.3.11 (a5f4e206) + * update dependency nodebb-theme-vanilla to v12.1.5 (d74a6bd3) + * update dependency sharp to v0.29.2 (8b8fe393) + * update dependency postcss to v8.3.10 (b18a24e9) + * update dependency nodebb-theme-persona to v11.2.15 (f3c8d7da) + * update dependency nodebb-theme-persona to v11.2.14 (#9919) (5e08e67b) + * update dependency socket.io-client to v4.3.2 (deba3e27) + * update dependency socket.io to v4.3.1 (e1554f61) + * update socket.io packages (ce5a0a21) + * update dependency nodebb-plugin-spam-be-gone to v0.7.10 (600a8720) + * update dependency nodebb-plugin-composer-default to v7.0.10 (b0128f85) + * update dependency nodebb-plugin-markdown to v8.14.4 (f8f35d7e) + * update dependency nodebb-plugin-composer-default to v7.0.9 (ed874662) + * update dependency nodebb-theme-persona to v11.2.13 (1dba75e9) + * update dependency ioredis to v4.28.0 (4ff5452d) + * update dependency nodebb-theme-persona to v11.2.12 (fe9f82f6) + * update dependency ioredis to v4.27.11 (6d2e0aa9) + * update dependency nodebb-plugin-mentions to v2.14.1 (820f8cdf) + * update dependency jquery-ui to v1.13.0 (b0eb2aed) +* remove loading="lazy", fixes inf. scroll loaded images (01572785) +* windows tests (25ebbd65) +* undefined query showing in searches (6cfaea06) +* don't repeat search if on same page (89f5e06b) +* api session revoke test (0926ae6e) +* crash (da64810a) +* add missing translation (eb075c73) +* move record to controller (ee8e0480) +* profile edit fields showing translated values (63572c23) +* #9934, fix translator test (8d316d18) +* token verify (04dab1d5) +* guard against prototype pollution (1783f918) +* translator path traversal (c8b2fc46) +* there is no alltime digest, fixes translation in test email (e62948f7) +* clicking outside postContainer should close tooltip (47df62e7) +* minification regression (998b9e79) +* tooltip (fec7ebed) +* biweekly digest #8053 (9cb4de50) +* restore plugin upgrade checking logic (44687394) +* fallbacks for new langauge key (ed4ebd22) +* #9917, show topics as unread for guests (4333d217) +* clarify site settings urls vs config.json url (#9912) (6436aa65) +* clarify SMTP enable toggle (#9911) (09f198fc) +* don't overwrite reloadRequired with false (9e0ce027) +* delete translations in admin/general folder (since general was removed and relocated elsewhere) (b460e590) +* pushed missing key to tx and pulled fallbacks (21b61082) +* adding missing language namespace "top" (0f9b0b78) +* extra debug log (bd893cda) +* have renovate add `dependencies` label to its PRs (eddb9868) +* no global bootbox (#9879) (227456fb) +* #9872 update app badge with notification count if applicable (3e69bcdf) +* better nomenclature (c1149d04) +* html attributes (#9877) (3acaac4c) +* escape thumbs, allow robots meta tag (4f9717fb) +* missing translations (#9876) (7935bd9e) + +##### Performance Improvements + +* dont fs.open if plugin doesnt have language namespace (#9893) (1feb111a) + +##### Refactors + +* wider value field (c428ba80) +* dont save partial searches (c7e078d4) +* use search api for topic search (64192731) +* slowdown quick search (19ee7174) +* typo (a5287906) +* add callback to loadNotifications (f02fba29) +* simplified utilities API > login rout (506c34a8) +* log error as well (1d62bd6d) +* catch errors from buildHeader in error handler :fire: (73a9ca09) +* add missing helpers.tryRoute (d4da9840) +* shorter middleware (ee0282f5) +* meta/minifier use async/await (b2429ef0) +* remove unused var (90b81262) +* catch errors from digest (8e319a9b) +* less.render returns promise (14bc83a8) +* less.render already returns promise (6da32392) +* prompt.get already returns promise (c70eaa0a) +* no need for async/callbacks (057d1d58) +* no more :cow: (38756a0c) +* allow array of uids for blocks.is/list (a9bc6a09) +* show full url on error log (8e6bd7e9) +* var to const and let (#9885) (b0a24d6d) +* remove unused code (997fb2b3) +* remove unused colorpicker (543d8521) + +##### Reverts + +* lazy load (3d1cf168) + +##### Tests + +* fix broken openapi3 schema (7ef5214e) +* restore commented-out i18n test (fa1afbcf) +* moved topic event and topic thumb tests to subfolder for better organisation (154ffea0) +* remove escape (6c25b9db) +* possible fix to timeout (63109c07) +* increase timeout (8654a996) + #### v1.18.4 (2021-10-06) ##### Chores From 1e418f5b5e763fb725fdfcc9368a5f42c3b10732 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 27 Oct 2021 16:47:58 +0000 Subject: [PATCH 03/95] chore: incrementing version number - v1.18.5 (cherry picked from commit c248805165a06d82be171f442278710064945f9f) Signed-off-by: Misty (Bot) --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 3dd20a53be..cb89650f40 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "1.18.4", + "version": "1.18.5", "homepage": "http://www.nodebb.org", "repository": { "type": "git", @@ -182,4 +182,4 @@ "url": "https://github.com/barisusakli" } ] -} +} \ No newline at end of file From 8f08d9cac03abeb9958cda51e5df55593d4bedc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 27 Oct 2021 14:21:36 -0400 Subject: [PATCH 04/95] fix: handle undefined data.query --- src/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/search.js b/src/search.js index e336031e45..0a0d1f459c 100644 --- a/src/search.js +++ b/src/search.js @@ -58,7 +58,7 @@ async function searchInContent(data) { } let pids = []; let tids = []; - const inTopic = data.query.match(/^in:topic-([\d]+) /); + const inTopic = String(data.query || '').match(/^in:topic-([\d]+) /); if (inTopic) { const tid = inTopic[1]; const cleanedTerm = data.query.replace(inTopic[0], ''); From bda5d1442574226f2fd4f021ef3b431a4875c9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 27 Oct 2021 14:40:42 -0400 Subject: [PATCH 05/95] test: empty query params for search --- test/search.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/search.js b/test/search.js index 909a1b7f2f..ee28dd3956 100644 --- a/test/search.js +++ b/test/search.js @@ -273,4 +273,20 @@ describe('Search', () => { }); }); }); + + it('should not crash without a search term', (done) => { + const qs = '/api/search'; + privileges.global.give(['groups:search:content'], 'guests', (err) => { + assert.ifError(err); + request({ + url: nconf.get('url') + qs, + json: true, + }, (err, response, body) => { + assert.ifError(err); + assert(body); + assert.strictEqual(response.statusCode, 200); + privileges.global.rescind(['groups:search:content'], 'guests', done); + }); + }); + }); }); From 4ffbbae8788b57c74da15d4c0a271bf594be2610 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 28 Oct 2021 09:07:10 +0000 Subject: [PATCH 06/95] Latest translations and fallbacks --- public/language/sl/admin/advanced/events.json | 2 +- .../sl/admin/appearance/customise.json | 2 +- public/language/sl/admin/dashboard.json | 12 +++---- public/language/sl/admin/manage/users.json | 12 +++---- public/language/sl/admin/menu.json | 34 +++++++++---------- public/language/tr/admin/advanced/events.json | 2 +- public/language/tr/admin/dashboard.json | 10 +++--- .../language/tr/admin/manage/categories.json | 2 +- public/language/tr/admin/manage/digest.json | 2 +- .../language/tr/admin/manage/privileges.json | 16 ++++----- public/language/tr/admin/manage/uploads.json | 4 +-- public/language/tr/admin/manage/users.json | 4 +-- public/language/tr/admin/menu.json | 2 +- public/language/tr/admin/settings/email.json | 14 ++++---- .../language/tr/admin/settings/general.json | 22 ++++++------ .../tr/admin/settings/notifications.json | 2 +- public/language/tr/admin/settings/post.json | 8 ++--- .../tr/admin/settings/reputation.json | 2 +- public/language/tr/admin/settings/user.json | 2 +- public/language/tr/email.json | 6 ++-- public/language/tr/error.json | 20 +++++------ public/language/tr/global.json | 2 +- public/language/tr/modules.json | 2 +- public/language/tr/register.json | 6 ++-- public/language/tr/topic.json | 14 ++++---- public/language/tr/user.json | 10 +++--- 26 files changed, 107 insertions(+), 107 deletions(-) diff --git a/public/language/sl/admin/advanced/events.json b/public/language/sl/admin/advanced/events.json index 1b5a03dc18..a06766728e 100644 --- a/public/language/sl/admin/advanced/events.json +++ b/public/language/sl/admin/advanced/events.json @@ -3,7 +3,7 @@ "no-events": "Ni dogodkov", "control-panel": "Nadzorna plošča za dogodke", "delete-events": "Izbriši dogodke", - "confirm-delete-all-events": "Are you sure you want to delete all logged events?", + "confirm-delete-all-events": "Ali ste prepričani, da želite izbrisati vse zabeležene dogodke?", "filters": "Filtri", "filters-apply": "Uveljavi filtre", "filter-type": "Tip dogodka", diff --git a/public/language/sl/admin/appearance/customise.json b/public/language/sl/admin/appearance/customise.json index cea68f5b8a..744b60dc2e 100644 --- a/public/language/sl/admin/appearance/customise.json +++ b/public/language/sl/admin/appearance/customise.json @@ -11,6 +11,6 @@ "custom-header.description": "Tukaj vnesite HTML po meri (npr. meta oznake itd.), ki bo dodan v & lt; head & gt; razdelek oznak vašega foruma. Oznake skript so dovoljene, vendar niso priporočljive, saj je na voljo zavihek Javascript po meri.", "custom-header.enable": "Omogoči glavo po meri", - "custom-css.livereload": "Enable Live Reload", + "custom-css.livereload": "Omogoči ponovno nalaganje v živo", "custom-css.livereload.description": "Omogočite to, da se vse seje na vsaki napravi v vašem računu osvežijo, ko kliknete shrani" } \ No newline at end of file diff --git a/public/language/sl/admin/dashboard.json b/public/language/sl/admin/dashboard.json index 9f7b21b93a..7b8d329e5c 100644 --- a/public/language/sl/admin/dashboard.json +++ b/public/language/sl/admin/dashboard.json @@ -56,19 +56,19 @@ "active-users.total": "Skupaj", "active-users.connections": "Povezave", - "guest-registered-users": "Guest vs Registered Users", - "guest": "Guest", + "guest-registered-users": "Gostujoči napram registriranim uporabnikom", + "guest": "Gost", "registered": "Registrirani", "user-presence": "Prisotnost uporabnikov", - "on-categories": "On categories list", + "on-categories": "Na seznam kategorij", "reading-posts": "Branje objav", "browsing-topics": "Brskanje po temah", "recent": "Nedavno", "unread": "Neprebrano", "high-presence-topics": "Teme z visoko prisotnostjo", - "popular-searches": "Popular Searches", + "popular-searches": "Priljubljena iskanja", "graphs.page-views": "Ogledov strani", "graphs.page-views-registered": "Ogledov strani-registrirani", @@ -76,14 +76,14 @@ "graphs.page-views-bot": "Ogledov strani-robot", "graphs.unique-visitors": "Edinstveni obiskovalci", "graphs.registered-users": "Registrirani uporabniki", - "graphs.guest-users": "Guest Users", + "graphs.guest-users": "Gostujoči uporabniki", "last-restarted-by": "Nazadnje ponovno zagnal(a)", "no-users-browsing": "Ne brska noben uporabnik", "back-to-dashboard": "Nazaj na nadzorno ploščo", "details.no-users": "V izbranem časovnem okviru se ni pridružil noben uporabnik", "details.no-topics": "V izbranem časovnem okviru ni bila objavljena nobena tema", - "details.no-searches": "No searches have been made yet", + "details.no-searches": "Iskanja še niso bila izvedena", "details.no-logins": "V izbranem časovnem okviru ni bila zabeležena nobena prijava", "details.logins-static": "NodeBB shranjuje samo podatke o sejah za %1 dni, zato bo ta spodnja tabela prikazala samo zadnje aktivne seje", "details.logins-login-time": "Čas prijave" diff --git a/public/language/sl/admin/manage/users.json b/public/language/sl/admin/manage/users.json index 4f9ca41006..8fbd1bc68f 100644 --- a/public/language/sl/admin/manage/users.json +++ b/public/language/sl/admin/manage/users.json @@ -1,8 +1,8 @@ { "users": "Uporabniki", "edit": "Dejanja", - "make-admin": "Make Admin", - "remove-admin": "Remove Admin", + "make-admin": "Nastavi kot skrbnika", + "remove-admin": "Odstrani kot skrbnika", "validate-email": "Potrdite e-poštni naslov", "send-validation-email": "Pošljite potrditveno e-sporočilo", "password-reset-email": "Pošljite e-poštno sporočilo za ponastavitev gesla", @@ -40,14 +40,14 @@ "search.ip-placeholder": "Za iskanje vnesite IP naslov", "search.not-found": "Uporabnika ni bilo mogoče najti!", - "inactive.3-months": "3 months", - "inactive.6-months": "6 months", - "inactive.12-months": "12 months", + "inactive.3-months": "3 mes.", + "inactive.6-months": "6 mes.", + "inactive.12-months": "12 mes.", "users.uid": "uid", "users.username": "uporabniško ime", "users.email": "e-poštni naslov", - "users.no-email": "(no email)", + "users.no-email": "(ni e-poštnega naslova)", "users.ip": "IP", "users.postcount": "postcount", "users.reputation": "ugled", diff --git a/public/language/sl/admin/menu.json b/public/language/sl/admin/menu.json index 0484b96aee..14b3e8c210 100644 --- a/public/language/sl/admin/menu.json +++ b/public/language/sl/admin/menu.json @@ -1,10 +1,10 @@ { "section-dashboard": "Dashboards", - "dashboard/overview": "Overview", + "dashboard/overview": "Pregled", "dashboard/logins": "Prijave", "dashboard/users": "Uporabniki", "dashboard/topics": "Teme", - "dashboard/searches": "Searches", + "dashboard/searches": "Iskanja", "section-general": "Splošno", "section-manage": "Upravljaj", @@ -12,13 +12,13 @@ "manage/privileges": "Privileges", "manage/tags": "Oznake", "manage/users": "Uporabniki", - "manage/admins-mods": "Admins & Mods", + "manage/admins-mods": "Skrbniki in moderatorji", "manage/registration": "Čakalna vrsta registracij", "manage/post-queue": "Čakalna vrsta objav", "manage/groups": "Skupine", "manage/ip-blacklist": "IP črna lista", - "manage/uploads": "Uploads", - "manage/digest": "Digests", + "manage/uploads": "Nalaganja", + "manage/digest": "Povzetki", "section-settings": "Nastavitve", "settings/general": "Splošno", @@ -29,16 +29,16 @@ "settings/user": "Uporabniki", "settings/group": "Skupine", "settings/guest": "Gostje", - "settings/uploads": "Uploads", + "settings/uploads": "Nalaganja", "settings/languages": "Jeziki", "settings/post": "Objave", "settings/chat": "Klepeti", "settings/pagination": "Številčenje strani", "settings/tags": "Oznake", "settings/notifications": "Obvestila", - "settings/api": "API Access", + "settings/api": "API dostop", "settings/sounds": "Zvoki", - "settings/social": "Social", + "settings/social": "Družbeno", "settings/cookies": "Piškotki", "settings/web-crawler": "Web Crawler", "settings/sockets": "Vtičnice", @@ -48,12 +48,12 @@ "section-appearance": "Videz", "appearance/themes": "Teme", - "appearance/skins": "Skins", - "appearance/customise": "Custom Content (HTML/JS/CSS)", + "appearance/skins": "Preobleke", + "appearance/customise": "Vsebina po meri (HTML/JS/CSS)", "section-extend": "Extend", "extend/plugins": "Vtičniki", - "extend/widgets": "Widgets", + "extend/widgets": "Pripomočki", "extend/rewards": "Nagrade", "section-social-auth": "Social Authentication", @@ -67,7 +67,7 @@ "advanced/hooks": "Hooks", "advanced/logs": "Prijave", "advanced/errors": "Napake", - "advanced/cache": "Cache", + "advanced/cache": "Predpomnilnik", "development/logger": "Logger", "development/info": "Info", @@ -78,12 +78,12 @@ "search.placeholder": "Press "/" to search for settings", "search.no-results": "Ni rezultatov...", - "search.search-forum": "Search the forum for ", - "search.keep-typing": "Type more to see results...", - "search.start-typing": "Start typing to see results...", + "search.search-forum": "Na forumu poišči ", + "search.keep-typing": "Vnesite več, da vidite rezultate...", + "search.start-typing": "Začnite tipkati, da vidite rezultate...", - "connection-lost": "Connection to %1 has been lost, attempting to reconnect...", + "connection-lost": "Povezava z %1 je bila izgubljena, poskus ponovne povezave...", - "alerts.version": "Running NodeBB v%1", + "alerts.version": "Teče NodeBB v%1", "alerts.upgrade": "Nadgradi na v%1" } \ No newline at end of file diff --git a/public/language/tr/admin/advanced/events.json b/public/language/tr/admin/advanced/events.json index aebc5bd0da..14bdd8788c 100644 --- a/public/language/tr/admin/advanced/events.json +++ b/public/language/tr/admin/advanced/events.json @@ -3,7 +3,7 @@ "no-events": "Aktivite yok", "control-panel": "Aktivite Kontrol Paneli", "delete-events": "Aktiviteyi Sil", - "confirm-delete-all-events": "Are you sure you want to delete all logged events?", + "confirm-delete-all-events": "Kaydedilen tüm etkinlikleri silmek istediğinizden emin misiniz?", "filters": "Filtreler", "filters-apply": "Filtreleri Uygula", "filter-type": "Aktivite türü", diff --git a/public/language/tr/admin/dashboard.json b/public/language/tr/admin/dashboard.json index 132f58a29a..f7bdad37b3 100644 --- a/public/language/tr/admin/dashboard.json +++ b/public/language/tr/admin/dashboard.json @@ -56,8 +56,8 @@ "active-users.total": "Genel Toplam", "active-users.connections": "Bağlantılar", - "guest-registered-users": "Guest vs Registered Users", - "guest": "Guest", + "guest-registered-users": "Misafir ve Kayıtlı Kullanıcılar", + "guest": "Misafir", "registered": "Kayıtlı", "user-presence": "Kullanıcı Durumları", @@ -68,7 +68,7 @@ "unread": "Okunmamış Konular Sayfasında", "high-presence-topics": "Öne Çıkan Başlıklar", - "popular-searches": "Popular Searches", + "popular-searches": "Popüler Aramalar", "graphs.page-views": "Sayfa Gösterimi", "graphs.page-views-registered": "Kayıtlı Kullanıcıların Sayfa Gösterimi", @@ -76,14 +76,14 @@ "graphs.page-views-bot": "Bot Sayfa Gösterimi", "graphs.unique-visitors": "Benzersiz Ziyaretçiler", "graphs.registered-users": "Kayıtlı Kullanıcılar", - "graphs.guest-users": "Guest Users", + "graphs.guest-users": "Misafir Kullanıcılar", "last-restarted-by": "Son yeniden başlatma bilgisi", "no-users-browsing": "İnceleyen kullanıcı yok", "back-to-dashboard": "Yönetim Paneline geri dön", "details.no-users": "Seçilen zaman aralığında herhangi bir kullanıcı üye olmadı.", "details.no-topics": "Seçilen zaman aralığında herhangi bir başlık oluşturulmadı. ", - "details.no-searches": "No searches have been made yet", + "details.no-searches": "Henüz arama yapılmadı", "details.no-logins": "Seçilen zaman aralığında herhangi bir giriş yapılmadı.", "details.logins-static": "NodeBB oturum kayıtlarını sadece %1 gün tutar, o nedenle aşağıdaki tablo sadece en yakın aktif oturumları listeler", "details.logins-login-time": "Giriş zamanı" diff --git a/public/language/tr/admin/manage/categories.json b/public/language/tr/admin/manage/categories.json index 5d09d269e6..c15eb8d545 100644 --- a/public/language/tr/admin/manage/categories.json +++ b/public/language/tr/admin/manage/categories.json @@ -33,7 +33,7 @@ "analytics": "Analiz", "view-category": "Kategori Görüntüle", "set-order": "Bir sıra ayarla", - "set-order-help": "Setting the order of the category will move this category to that order and update the order of other categories as necessary. Minimum order is 1 which puts the category at the top.", + "set-order-help": "Kategorinin sırasını ayarlamak, bu kategoriyi o sıraya taşıyacak ve diğer kategorilerin sırasını güncelleyecektir. Kategoriyi en üste taşımak için 1 girin.", "select-category": "Kategori Seç", "set-parent-category": "Ana Kategori Ayarla", diff --git a/public/language/tr/admin/manage/digest.json b/public/language/tr/admin/manage/digest.json index 1548169764..5caee118ff 100644 --- a/public/language/tr/admin/manage/digest.json +++ b/public/language/tr/admin/manage/digest.json @@ -13,7 +13,7 @@ "resent-single": "El ile özet gönderimi tamamlandı", "resent-day": "Günlük özet yeniden gönderildi", "resent-week": "Haftalık özet yeniden gönderildi", - "resent-biweek": "Bi-Weekly digest resent", + "resent-biweek": "İki Haftalık özeti yeniden gönder", "resent-month": "Aylık özet yeniden gönderildi", "null": "Hiçbir zaman", "manual-run": "El ile özet gönderimi:", diff --git a/public/language/tr/admin/manage/privileges.json b/public/language/tr/admin/manage/privileges.json index a915eb8d45..e641167ad8 100644 --- a/public/language/tr/admin/manage/privileges.json +++ b/public/language/tr/admin/manage/privileges.json @@ -25,7 +25,7 @@ "access-topics": "Başlıklara Eriş", "create-topics": "Başlık Oluştur", "reply-to-topics": "Başlığı Cevapla", - "schedule-topics": "Schedule Topics", + "schedule-topics": "Konuları Planla", "tag-topics": "Başlığı etiketle", "edit-posts": "İletiyi düzenle", "view-edit-history": "Düzenleme Geçmişini Görüntüle", @@ -51,13 +51,13 @@ "alert.saved": "Ayrıcalık değişiklikleri kaydedildi ve uygulandı", "alert.confirm-discard": "Ayrıcalık değişikliklerini iptal etmek istediğinize emin misiniz?", "alert.discarded": "Ayrıcalık değişiklikleri iptal edildi", - "alert.confirm-copyToAll": "Are you sure you wish to apply this set of %1 to all categories?", - "alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's set of %1 to all categories?", - "alert.confirm-copyToChildren": "Are you sure you wish to apply this set of %1 to all descendant (child) categories?", - "alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's set of %1 to all descendant (child) categories?", + "alert.confirm-copyToAll": "Bu %1 kategorisini tüm kategorilere uygulamak istediğinizden emin misiniz? ", + "alert.confirm-copyToAllGroup": "Bu grubun %1 kümesini tüm kategorilere uygulamak istediğinizden emin misiniz?", + "alert.confirm-copyToChildren": "Bu %1 kümesini tüm alt (alt) kategorilere uygulamak istediğinizden emin misiniz?", + "alert.confirm-copyToChildrenGroup": "Bu grubun %1 kümesini tüm alt (alt) kategorilere uygulamak istediğinizden emin misiniz?", "alert.no-undo": "Bu işlem geri alınamaz.", "alert.admin-warning": "Yöneticiler dolaylı olarak tüm ayrıcalıklara sahiptirler", - "alert.copyPrivilegesFrom-title": "Select a category to copy from", - "alert.copyPrivilegesFrom-warning": "This will copy %1 from the selected category.", - "alert.copyPrivilegesFromGroup-warning": "This will copy this group's set of %1 from the selected category." + "alert.copyPrivilegesFrom-title": "Kopyalamak için bir kategori seçin", + "alert.copyPrivilegesFrom-warning": "Seçilen kategoriden %1 kopyalayacaktır.", + "alert.copyPrivilegesFromGroup-warning": "Bu, seçilen kategoriden bu grubun %1 kümesini kopyalayacaktır." } \ No newline at end of file diff --git a/public/language/tr/admin/manage/uploads.json b/public/language/tr/admin/manage/uploads.json index 60fbb950ba..c3cd6a4574 100644 --- a/public/language/tr/admin/manage/uploads.json +++ b/public/language/tr/admin/manage/uploads.json @@ -6,6 +6,6 @@ "size/filecount": "Boyut / Dosya sayısı", "confirm-delete": "Bu dosyayı silmek istediğinden emin misin?", "filecount": "%1 dosya", - "new-folder": "New Folder", - "name-new-folder": "Enter a name for new the folder" + "new-folder": "Yeni Dosya", + "name-new-folder": "Yeni klasör için bir ad girin" } \ No newline at end of file diff --git a/public/language/tr/admin/manage/users.json b/public/language/tr/admin/manage/users.json index ebe7d2c28b..aa8b784cb6 100644 --- a/public/language/tr/admin/manage/users.json +++ b/public/language/tr/admin/manage/users.json @@ -1,6 +1,6 @@ { "users": "Kullanıcılar", - "edit": "Actions", + "edit": "Hareketler", "make-admin": "Yönetici Yap", "remove-admin": "Yöneticiliği Sil", "validate-email": "E-postayı Doğrula", @@ -47,7 +47,7 @@ "users.uid": "benzersiz id", "users.username": "kullanıcı adı", "users.email": "e-posta", - "users.no-email": "(no email)", + "users.no-email": "(e-mail yok)", "users.ip": "IP", "users.postcount": "ileti sayısı", "users.reputation": "itibar", diff --git a/public/language/tr/admin/menu.json b/public/language/tr/admin/menu.json index 0d5e14bc14..821acc2ed1 100644 --- a/public/language/tr/admin/menu.json +++ b/public/language/tr/admin/menu.json @@ -4,7 +4,7 @@ "dashboard/logins": "Girişler", "dashboard/users": "Kullanıcılar", "dashboard/topics": "Başlıklar", - "dashboard/searches": "Searches", + "dashboard/searches": "Aramalar", "section-general": "Genel", "section-manage": "Yönet", diff --git a/public/language/tr/admin/settings/email.json b/public/language/tr/admin/settings/email.json index 3d77ac0d53..0dffd74edf 100644 --- a/public/language/tr/admin/settings/email.json +++ b/public/language/tr/admin/settings/email.json @@ -6,7 +6,7 @@ "from-help": "The from name to display in the email.", "smtp-transport": "SMTP Transport", - "smtp-transport.enabled": "Enable 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.", "smtp-transport.service": "Select a service", "smtp-transport.service-custom": "Özel Servis", @@ -37,10 +37,10 @@ "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 ", "notifications.remove-images": "Görselleri e-posta bildirimlerinden kaldır", - "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. 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.", - "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.", - "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." + "require-email-address": "Yeni kullanıcıların bir e-posta adresi belirtmesini gerektir", + "require-email-address-warning": "Varsayılan olarak kullanıcıların bir e-posta adresi girmesi devre dışıdır. Bu seçeneğin etkinleştirilmesi, kayıt işlemine devam etmek için bir e-posta adresi girmeleri gerektiği anlamına gelir. Elbette bu kullanıcının gerçek bir e-posta adresi veya sahip olduğu bir adresi girmelerini sağlamaz.", + "include-unverified-emails": "E-postalarını onaylamayan alıcılara onay e-postası gönderin", + "include-unverified-warning": "Varsayılan olarak, hesaplarıyla ilişkili e-postaları olan kullanıcılar (Sosyal Login) zaten doğrulanmıştır, ancak durumun böyle olmadığı durumlar vardır (ör. Riski size ait olmak üzere bu ayarı etkinleştirin – doğrulanmamış adreslere e-posta göndermek, bölgesel istenmeyen posta önleme yasalarının ihlali olabilir.", + "prompt": "Kullanıcılardan e-postalarını girmelerini veya onaylamalarını isteyin", + "prompt-help": "Bir kullanıcının e-posta seti yoksa veya e-postası onaylanmadıysa ekranda bir uyarı gösterilir." } diff --git a/public/language/tr/admin/settings/general.json b/public/language/tr/admin/settings/general.json index 2d58a0e610..6bf2e17cdf 100644 --- a/public/language/tr/admin/settings/general.json +++ b/public/language/tr/admin/settings/general.json @@ -3,9 +3,9 @@ "title": "Site Başlığı", "title.short": "Başlık Kısaltması", "title.short-placeholder": "Eğer başlık kısaltması girilmediyse \"Site Başlığı\" kullanılacak", - "title.url": "Title Link URL", + "title.url": "Başlık Bağlantı URL'si", "title.url-placeholder": "Site başlığının URL adresi", - "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.
Note: This is not the external URL used in emails, etc. That is set by the url property in config.json", + "title.url-help": "Başlık tıklandığında kullanıcıları bu adrese gönderin. Boş bırakılırsa, kullanıcı forum dizinine gönderilecektir. Not: Bu, e-postalarda vb. kullanılan harici URL değildir. Bu, config.json'daki url özelliği tarafından belirlenir.", "title.name": "Topluluk İsmi", "title.show-in-header": "Site Konusunu Başlık'ta Göster", "browser-title": "Tarayıcı Başlığı", @@ -20,9 +20,9 @@ "logo.image": "Görsel", "logo.image-placeholder": "Forum başlığında görüntülenecek bir logo yolu", "logo.upload": "Yükle", - "logo.url": "Logo Link URL", + "logo.url": "Logonun Linki", "logo.url-placeholder": "Site Logo URL'si", - "logo.url-help": "When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index.
Note: This is not the external URL used in emails, etc. That is set by the url property in config.json", + "logo.url-help": "Logoya tıklandığında kullanıcıları bu adrese gönderin. Boş bırakılırsa, kullanıcı forum dizinine gönderilecektir. Not: Bu, e-postalarda vb. kullanılan harici URL değildir. Bu, config.json'daki url özelliği tarafından belirlenir.", "logo.alt-text": "Alt Yazı", "log.alt-text-placeholder": "Erişilebilirlik için alternatif metin", "favicon": "Favicon", @@ -35,16 +35,16 @@ "maskable-icon.help": "Önerilen boyut ve format: 512x512, PNG formatı. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.", "outgoing-links": "Harici Bağlantılar", "outgoing-links.warning-page": "Dışarı giden bağlantılar için uyarı sayfası kullan", - "search": "Search", - "search-default-in": "Search In", - "search-default-in-quick": "Quick Search In", - "search-default-sort-by": "Sort by", + "search": "Arama", + "search-default-in": "Araştır", + "search-default-in-quick": "Hızlı Arama", + "search-default-sort-by": "Göre sırala", "outgoing-links.whitelist": "Uyarı sayfasını atlamak için beyaz listeye eklenecek alan-adları", "site-colors": "Site Renk Metaverisi", "theme-color": "Tema rengi", "background-color": "Arkaplan rengi", "background-color-help": "Site PWA olarak kurulduğunda ekran arkaplanı olarak kullanılacak renk", - "undo-timeout": "Undo Timeout", - "undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.", - "topic-tools": "Topic Tools" + "undo-timeout": "Zaman Aşımını Geri Al", + "undo-timeout-help": "Konu taşıma gibi bazı işlemler, moderatörün belirli bir zaman dilimi içinde eylemlerini geri almasına olanak tanır. Tamamen geri almayı devre dışı bırakmak için 0'a ayarlayın.", + "topic-tools": "Konu Araçları" } diff --git a/public/language/tr/admin/settings/notifications.json b/public/language/tr/admin/settings/notifications.json index a4b20aa0d8..bf9502ff3d 100644 --- a/public/language/tr/admin/settings/notifications.json +++ b/public/language/tr/admin/settings/notifications.json @@ -3,5 +3,5 @@ "welcome-notification": "Hoş Geldin Bildirimi", "welcome-notification-link": "Hoş Geldin Bildirimi Bağlantısı", "welcome-notification-uid": "Kullanıcı Hoş Geldiniz Bildirimi (UID)", - "post-queue-notification-uid": "Post Queue User (UID)" + "post-queue-notification-uid": "İletisi kuyruğa alınan kullanıcı (UID)" } \ No newline at end of file diff --git a/public/language/tr/admin/settings/post.json b/public/language/tr/admin/settings/post.json index dee17e7dc2..8eb9aba208 100644 --- a/public/language/tr/admin/settings/post.json +++ b/public/language/tr/admin/settings/post.json @@ -51,14 +51,14 @@ "signature.no-links": "İmzalarda linkleri devre dışı bırak", "signature.no-images": "İmzalarda resimleri devre dışı bırak", "signature.max-length": "Maksimum İmza Uzunluğu", - "composer": "Yazar Ayarları", + "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.", "composer.show-help": "\"Yardım\" sekmesini göster", "composer.enable-plugin-help": "Eklentilerin yardım sekmesine içerik eklemesine izin ver", "composer.custom-help": "Özel Yardım Metni", - "backlinks": "Backlinks", - "backlinks.enabled": "Enable topic backlinks", - "backlinks.help": "If a post references another topic, a link back to the post will be inserted into the referenced topic at that point in time.", + "backlinks": "Geri bağlantılar", + "backlinks.enabled": "Konu geri bağlantılarını etkinleştir", + "backlinks.help": "Bir gönderi başka bir konuya atıfta bulunuyorsa, o anda referans verilen konuya gönderiye geri bir bağlantı eklenir.", "ip-tracking": "IP İzleme", "ip-tracking.each-post": "Her ileti için IP Adresini takip et", "enable-post-history": "Gönderi Geçmişini Etkinleştir" diff --git a/public/language/tr/admin/settings/reputation.json b/public/language/tr/admin/settings/reputation.json index 0109e0de78..cf5c2af702 100644 --- a/public/language/tr/admin/settings/reputation.json +++ b/public/language/tr/admin/settings/reputation.json @@ -17,6 +17,6 @@ "flags": "Şikayet Ayarları", "flags.limit-per-target": "Maksimum şikayet edilme sayısı", "flags.limit-per-target-placeholder": "Varsayılan: 0", - "flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.", + "flags.limit-per-target-help": "Bir gönderi veya kullanıcı birden çok kez işaretlendiğinde, her ek işaret bir \"rapor\" olarak kabul edilir ve orijinal bayrağa 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-resolve-on-ban": "Bir kullanıcı forumdan yasaklandığında otomatik olarak şikayetlerini çözülmüş say" } \ No newline at end of file diff --git a/public/language/tr/admin/settings/user.json b/public/language/tr/admin/settings/user.json index 99f120b5d8..ed09675de3 100644 --- a/public/language/tr/admin/settings/user.json +++ b/public/language/tr/admin/settings/user.json @@ -71,7 +71,7 @@ "digest-freq.off": "Kapalı", "digest-freq.daily": "Günlük", "digest-freq.weekly": "Haftalık", - "digest-freq.biweekly": "Bi-Weekly", + "digest-freq.biweekly": "İki haftada bir", "digest-freq.monthly": "Aylık", "email-chat-notifs": "Çevrimiçi değilken gelen mesajları e-posta olarak gönder", "email-post-notif": "Abone olduğum konulara cevap gelince bana e-posta gönder", diff --git a/public/language/tr/email.json b/public/language/tr/email.json index d91faa6217..e7d587826a 100644 --- a/public/language/tr/email.json +++ b/public/language/tr/email.json @@ -6,9 +6,9 @@ "greeting_no_name": "Merhaba", "greeting_with_name": "Merhaba %1", "email.verify-your-email.subject": "Lütfen e-posta adresinizi doğrulayın", - "email.verify.text1": "You've requested that we change or confirm your email address", - "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", - "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", + "email.verify.text1": "E-posta adresinizi değiştirmemizi veya onaylamamızı istediniz", + "email.verify.text2": "Güvenlik amacıyla, kayıtlı e-posta adresini yalnızca sahipliği e-posta yoluyla onaylandıktan sonra değiştirir veya onaylarız. Bunu talep etmediyseniz, herhangi bir işlem yapmanız gerekmez.", + "email.verify.text3": "Bu e-posta adresini onayladığınızda, mevcut e-posta adresinizi bununla (%1) değiştireceğiz.", "welcome.text1": "Kaydolduğunuz için teşekkürler!", "welcome.text2": "Hesabınızı aktif hale getirmek için, kaydolduğunuz e-posta adresinin size ait olduğunu onaylamamız gerekiyor.", "welcome.text3": "Yönetici kayıt olma isteğinizi kabul etti. Kullanıcı adı/şifre ile giriş yapabilirsiniz.", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 28e7e76b52..18c718f5b1 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -32,10 +32,10 @@ "email-taken": "E-posta Alınmış", "email-nochange": "Girdiğiniz e-posta var olan e-posta ile aynı", "email-invited": "E-posta halihazırda davet edilmiş", - "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.", + "email-not-confirmed": "E-postanız onaylandıktan sonra bazı kategorilerde veya konularda gönderiler etkinleştirilir, lütfen bir onay e-postası göndermek için burayı tıklayın.", "email-not-confirmed-chat": "E-postanız onaylanana kadar sohbet edemezsiniz, onaylamak için lütfen buraya tıklayın.", - "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You may not be able to post in some categories or chat until your email is confirmed.", - "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery, and may be necessary for chatting and posting in some categories. Please click here to enter an email.", + "email-not-confirmed-email-sent": "E-postanız henüz onaylanmadı, lütfen onay e-postası için gelen kutunuzu kontrol edin. E-postanız onaylanana kadar bazı kategorilerde gönderi paylaşamayabilir veya sohbet edemeyebilirsiniz.", + "no-email-to-confirm": "Hesabınızda bir e-posta grubu yok. Hesap kurtarma için bir e-posta gereklidir ve bazı kategorilerde sohbet etmek ve gönderi paylaşmak için gerekli olabilir. Bir e-posta girmek için lütfen burayı tıklayın.", "user-doesnt-have-email": "\"%1\" kullanıcısı bir e-posta belirlememiş.", "email-confirm-failed": "E-posta adresinizi doğrulayamıyoruz. Lütfen daha sonra tekrar deneyin.", "confirm-email-already-sent": "E-posta onayı zaten gönderilmiş, yeni bir onay göndermek için lütfen %1 dakika bekleyin.", @@ -198,14 +198,14 @@ "topic-event-unrecognized": "Konu aktivitesi '%1' tanımlanamadı", "cant-set-child-as-parent": "Alt-kategoriyi üst kategori olarak ayarlayamazsınız!", "cant-set-self-as-parent": "Kendisini üst kategori olarak ayarlayamazsınız!", - "api.master-token-no-uid": "A master token was received without a corresponding `_uid` in the request body", - "api.400": "Something was wrong with the request payload you passed in.", + "api.master-token-no-uid": "İsteğe karşılık gelen bir \"_uid\" olmadan bir ana belirteç alındı", + "api.400": "İlettiğiniz istekle ilgili bir sorun vardı.", "api.401": "Geçerli bir giriş oturumu bulunamadı. Lütfen yeniden giriş yapıp tekrar deneyin.", - "api.403": "You are not authorised to make this call", - "api.404": "Invalid API call", - "api.426": "HTTPS is required for requests to the write api, please re-send your request via HTTPS", + "api.403": "Bu aramayı yapmak için yetkiniz yok", + "api.404": "Geçersiz API çağrısı", + "api.426": "Yazma API'sine yapılan istekler için HTTPS gereklidir, lütfen isteğinizi HTTPS aracılığıyla yeniden gönderin", "api.429": "Fazla sayıda istekte bulundunuz, lütfen daha sonra tekrar deneyiniz.", "api.500": "İsteğinizi gerçekleştirmeye çalışırken beklenmeyen bir hata ile karşılaşıldı.", - "api.501": "The route you are trying to call is not implemented yet, please try again tomorrow", - "api.503": "The route you are trying to call is not currently available due to a server configuration" + "api.501": "Aramaya çalıştığınız rota henüz uygulanmadı, lütfen yarın tekrar deneyin", + "api.503": "Aramaya çalıştığınız rota sunucu yapılandırması nedeniyle şu anda kullanılamıyor" } \ No newline at end of file diff --git a/public/language/tr/global.json b/public/language/tr/global.json index b8c2bbaff9..e8bab24f0d 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -70,7 +70,7 @@ "firstpost": "İlk ileti", "read_more": "daha fazla oku", "more": "Daha Fazla", - "none": "None", + "none": "Hiçbiri", "posted_ago_by_guest": "Ziyaretçi tarafından %1 yayımlandı", "posted_ago_by": "%2 tarafından %1 yayımlandı", "posted_ago": "%1 yayımlandı", diff --git a/public/language/tr/modules.json b/public/language/tr/modules.json index fdc0ff7dac..a35259de4b 100644 --- a/public/language/tr/modules.json +++ b/public/language/tr/modules.json @@ -54,7 +54,7 @@ "composer.formatting.strikethrough": "Üstüçizili", "composer.formatting.code": "Kod", "composer.formatting.link": "Bağlantı", - "composer.formatting.picture": "Image Link", + "composer.formatting.picture": "Görsel Linki", "composer.upload-picture": "Görsel Yükle", "composer.upload-file": "Dosya Yükle", "composer.zen_mode": "Tam ekran modu", diff --git a/public/language/tr/register.json b/public/language/tr/register.json index 242ac0af82..0d81d81ce0 100644 --- a/public/language/tr/register.json +++ b/public/language/tr/register.json @@ -20,9 +20,9 @@ "registration-added-to-queue": "Kayıt olma isteğiniz kabul listesine eklenmiştir. Yönetici tarafından kabul edildiğinizde e-posta alacaksınız.", "registration-queue-average-time": "Üyelik onayı için bekleyeceğiniz ortalama süre: %1 saat %2 dakika.", "registration-queue-auto-approve-time": "Forum üyeliğiniz %1 saat içerisinde tamamen aktifleştirilecektir. ", - "interstitial.intro": "We'd like some additional information in order to update your account…", - "interstitial.intro-new": "We'd like some additional information before we can create your account…", - "interstitial.errors-found": "Please review the entered information:", + "interstitial.intro": "Hesabınızı güncellemek için bazı ek bilgiler istiyoruz…", + "interstitial.intro-new": "Hesabınızı oluşturabilmemiz için önce bazı ek bilgiler istiyoruz…", + "interstitial.errors-found": "Lütfen girilen bilgileri inceleyin:", "gdpr_agree_data": "Bu web sitesinde kişisel bilgilerimin toplanmasını ve işlenmesini kabul ediyorum.", "gdpr_agree_email": "Bu web sitesinden özet ve bildirim e-postası almaya izin veriyorum.", "gdpr_consent_denied": "Bilgilerinizi toplamak/işlemek ve size e-posta göndermek için bu siteye onay vermelisiniz.", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index 803a9e53af..0fbcb45d5c 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -20,8 +20,8 @@ "login-to-view": "🔒 Görüntülemek için giriş yap!", "edit": "Düzenle", "delete": "Sil", - "delete-event": "Delete Event", - "delete-event-confirm": "Are you sure you want to delete this event?", + "delete-event": "Etkinliği Sil", + "delete-event-confirm": "Bu etkinliği silmek istediğinizden emin misiniz?", "purge": "Temizle", "restore": "Geri Getir", "move": "Taşı", @@ -45,9 +45,9 @@ "unpinned-by": "Sabitlenme kaldırıldı", "deleted-by": "Silindi", "restored-by": "Tekrar Yüklendi", - "moved-from-by": "Moved from %1 by", + "moved-from-by": "%1 'den taşındı", "queued-by": "İleti onay için sıraya alındı →", - "backlink": "Referenced by", + "backlink": "başvurulan", "bookmark_instructions": "Bu konuda en son kaldığın yere dönmek için tıkla.", "flag-post": "Bu iletiyi şikayet et", "flag-user": "Bu kullanıcıyı şikayet et", @@ -139,7 +139,7 @@ "composer.handle_placeholder": "Kullanıcı adınızı buraya girin", "composer.discard": "Vazgeç", "composer.submit": "Gönder", - "composer.additional-options": "Additional Options", + "composer.additional-options": "Ekstra seçenekler", "composer.schedule": "Konu Zamanla", "composer.replying_to": "Yanıtlanan Başlık: %1", "composer.new_topic": "Yeni Başlık", @@ -160,7 +160,7 @@ "newest_to_oldest": "En yeniden en eskiye", "most_votes": "En çok oylanan", "most_posts": "En çok ileti yazılan", - "most_views": "Most Views", + "most_views": "Çok Görüntülenen", "stale.title": "Bunun yerine yeni bir başlık oluşturun?", "stale.warning": "Yanıtlamak istediğiniz başlık oldukça eski. Bu başlığa referans oluşturacak yeni bir başlık oluşturmak ister misiniz?", "stale.create": "Yeni bir başlık oluştur", @@ -180,5 +180,5 @@ "timeago_earlier": "%1 önce", "first-post": "İlk ileti", "last-post": "Son ileti", - "post-quick-reply": "Post quick reply" + "post-quick-reply": "Hızlı yanıt gönder" } \ No newline at end of file diff --git a/public/language/tr/user.json b/public/language/tr/user.json index ae99629a6b..dd6fef03b0 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -94,12 +94,12 @@ "digest_off": "Kapalı", "digest_daily": "Günlük", "digest_weekly": "Haftalık", - "digest_biweekly": "Bi-Weekly", + "digest_biweekly": "İki haftada bir", "digest_monthly": "Aylık", "has_no_follower": "Bu kullanıcının hiç takipçisi yok :(", "follows_no_one": "Bu kullanıcı kimseyi takip etmiyor :(", "has_no_posts": "Bu kullanıcı henüz herhangi bir ileti yazmamış :(", - "has_no_best_posts": "This user does not have any upvoted posts yet.", + "has_no_best_posts": "Bu kullanıcının herhangi bir gönderisi henüz olumlu oy almadı.", "has_no_topics": "Bu kullanıcı henüz hiçbir başlık açmamış :(", "has_no_watched_topics": "Bu kullanıcı henüz hiçbir başlığı takip etmiyor :(", "has_no_ignored_topics": "Bu kullanıcı henüz hiçbir başlığı yok saymamış.", @@ -183,7 +183,7 @@ "consent.export-uploads-success": "Yüklemeler aktarılmak üzere hazırlanıyor, işlem tamamlandığında bildirim alacaksınız!", "consent.export_posts": "Gönderileri Dışa Aktar (.csv)", "consent.export-posts-success": "İletiler aktarılmak üzere hazırlanıyor, işlem tamamlandığında bildirim alacaksınız!", - "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", - "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", - "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." + "emailUpdate.intro": "Lütfen e-posta adresinizi aşağıya girin. Bu forum, e-posta adresinizi planlanmış özet ve bildirimler ile parolanın kaybolması durumunda hesap kurtarma için kullanır.", + "emailUpdate.optional": "Bu alan isteğe bağlıdır. E-posta adresinizi vermek zorunda değilsiniz, ancak doğrulanmış bir e-posta olmadan hesabınızı kurtaramazsınız.", + "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." } \ No newline at end of file From 50b2ebf844c6d77056929cede32e83f29a66e1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 28 Oct 2021 09:46:21 -0400 Subject: [PATCH 07/95] fix: remove unused code --- public/src/client/topic.js | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 5cc2da69a5..944bd9ad2a 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -32,12 +32,6 @@ define('forum/topic', [ navigator.disable(); components.get('navbar/title').find('span').text('').hide(); app.removeAlert('bookmark'); - - require(['search'], function (search) { - if (search.topicDOM.active) { - search.topicDOM.end(); - } - }); } }); @@ -79,18 +73,6 @@ define('forum/topic', [ }; function handleTopicSearch() { - $('.topic-search').off('click') - .on('click', '.prev', function () { - require(['search'], function (search) { - search.topicDOM.prev(); - }); - }) - .on('click', '.next', function () { - require(['search'], function (search) { - search.topicDOM.next(); - }); - }); - if (config.topicSearchEnabled) { require(['mousetrap'], function (mousetrap) { mousetrap.bind(['command+f', 'ctrl+f'], function (e) { From e8c17feedba203ce1a93017661c4c0587dc8c22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 28 Oct 2021 12:00:51 -0400 Subject: [PATCH 08/95] refactor: use utils.debounce --- public/src/client/topic.js | 55 +++++++++++++------------------------- 1 file changed, 19 insertions(+), 36 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 944bd9ad2a..6fe0310dd6 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -7,7 +7,6 @@ define('forum/topic', [ 'forum/topic/postTools', 'forum/topic/events', 'forum/topic/posts', - 'forum/topic/images', 'navigator', 'sort', 'components', @@ -15,17 +14,13 @@ define('forum/topic', [ 'hooks', ], function ( infinitescroll, threadTools, postTools, - events, posts, images, navigator, sort, + events, posts, navigator, sort, components, storage, hooks ) { - const Topic = {}; + const Topic = {}; let currentUrl = ''; $(window).on('action:ajaxify.start', function (ev, data) { - if (Topic.replaceURLTimeout) { - clearTimeout(Topic.replaceURLTimeout); - Topic.replaceURLTimeout = 0; - } events.removeListeners(); if (!String(data.url).startsWith('topic/')) { @@ -44,7 +39,7 @@ define('forum/topic', [ posts.onTopicPageLoad(components.get('post')); - navigator.init('[component="post"]', ajaxify.data.postcount, Topic.toTop, Topic.toBottom, Topic.navigatorCallback); + navigator.init('[component="post"]', ajaxify.data.postcount, Topic.toTop, Topic.toBottom, utils.debounce(Topic.navigatorCallback, 500)); postTools.init(tid); threadTools.init(tid, $('.topic')); @@ -61,11 +56,9 @@ define('forum/topic', [ addDropupHandler(); addRepliesHandler(); - - handleBookmark(tid); - $(window).on('scroll', updateTopicTitle); + $(window).on('scroll', utils.debounce(updateTopicTitle, 250)); handleTopicSearch(); @@ -192,41 +185,31 @@ define('forum/topic', [ } Topic.navigatorCallback = function (index, elementCount) { - const path = ajaxify.removeRelativePath(window.location.pathname.slice(1)); - if (!path.startsWith('topic')) { - return; - } - - if (navigator.scrollActive) { + if (!ajaxify.data.template.topic || navigator.scrollActive) { return; } const newUrl = 'topic/' + ajaxify.data.slug + (index > 1 ? ('/' + index) : ''); if (newUrl !== currentUrl) { - if (Topic.replaceURLTimeout) { - clearTimeout(Topic.replaceURLTimeout); - Topic.replaceURLTimeout = 0; - } currentUrl = newUrl; - Topic.replaceURLTimeout = setTimeout(function () { - if (index >= elementCount && app.user.uid) { - socket.emit('topics.markAsRead', [ajaxify.data.tid]); - } - updateUserBookmark(index); + if (index >= elementCount && app.user.uid) { + socket.emit('topics.markAsRead', [ajaxify.data.tid]); + } - Topic.replaceURLTimeout = 0; - if (ajaxify.data.updateUrlWithPostIndex && history.replaceState) { - let search = window.location.search || ''; - if (!config.usePagination) { - search = (search && !/^\?page=\d+$/.test(search) ? search : ''); - } + updateUserBookmark(index); - history.replaceState({ - url: newUrl + search, - }, null, window.location.protocol + '//' + window.location.host + config.relative_path + '/' + newUrl + search); + Topic.replaceURLTimeout = 0; + if (ajaxify.data.updateUrlWithPostIndex && history.replaceState) { + let search = window.location.search || ''; + if (!config.usePagination) { + search = (search && !/^\?page=\d+$/.test(search) ? search : ''); } - }, 500); + + history.replaceState({ + url: newUrl + search, + }, null, window.location.protocol + '//' + window.location.host + config.relative_path + '/' + newUrl + search); + } } }; From 755860f16b41c8c80ad20a779c7c8bb0da13c256 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 28 Oct 2021 16:30:45 +0000 Subject: [PATCH 09/95] fix(deps): update dependency autoprefixer to v10.4.0 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index cb89650f40..1ef42043c1 100644 --- a/install/package.json +++ b/install/package.json @@ -32,7 +32,7 @@ "ace-builds": "^1.4.12", "archiver": "^5.2.0", "async": "^3.2.0", - "autoprefixer": "10.3.7", + "autoprefixer": "10.4.0", "bcryptjs": "2.4.3", "benchpressjs": "2.4.3", "body-parser": "^1.19.0", From bc4b19b4d73c7a3c9709d2ee0ef45c892f1137fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 28 Oct 2021 15:12:12 -0400 Subject: [PATCH 10/95] fix: typo in flags --- src/api/flags.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/flags.js b/src/api/flags.js index 19a8887260..235030c9df 100644 --- a/src/api/flags.js +++ b/src/api/flags.js @@ -51,7 +51,7 @@ flagsApi.appendNote = async (caller, data) => { } } catch (e) { // Okay if not does not exist in database - if (!e.message === '[[error:invalid-data]]') { + if (e.message !== '[[error:invalid-data]]') { throw e; } } From 62ac9a8bbbd561520095516e925cd40b766ca313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 28 Oct 2021 15:40:53 -0400 Subject: [PATCH 11/95] test: add test aliases.buildTargets --- test/meta.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/meta.js b/test/meta.js index 841d7b11ef..86ea5a3637 100644 --- a/test/meta.js +++ b/test/meta.js @@ -602,4 +602,10 @@ describe('meta', () => { }); }); }); + + it('should log targets', (done) => { + const aliases = require('../src/meta/aliases'); + aliases.buildTargets(); + done(); + }); }); From 74aa12c95b2acd3dab01b283c33eb24a358411aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 28 Oct 2021 21:33:21 -0400 Subject: [PATCH 12/95] fix: hooks is sometimes undefined --- public/src/app.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 63787b6fe3..bacbc2309d 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -593,11 +593,14 @@ app.cacheBuster = null; }); let ajaxified = false; - hooks.on('action:ajaxify.end', function () { - if (!ajaxify.isCold()) { - ajaxified = true; - } + require(['hooks'], function (hooks) { + hooks.on('action:ajaxify.end', function () { + if (!ajaxify.isCold()) { + ajaxified = true; + } + }); }); + inputEl.on('focus', function () { mousedownOnResults = false; const query = inputEl.val(); From d8d5f416cc595af0bdd35b77c2ade55b3c7fae9a Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 29 Oct 2021 09:06:56 +0000 Subject: [PATCH 13/95] Latest translations and fallbacks --- public/language/fr/admin/dashboard.json | 10 +++++----- public/language/fr/admin/manage/digest.json | 2 +- public/language/fr/admin/menu.json | 2 +- public/language/fr/admin/settings/cookies.json | 2 +- public/language/fr/admin/settings/email.json | 6 +++--- public/language/fr/admin/settings/general.json | 8 ++++---- public/language/fr/admin/settings/user.json | 2 +- public/language/fr/error.json | 4 ++-- public/language/fr/topic.json | 2 +- public/language/fr/user.json | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/public/language/fr/admin/dashboard.json b/public/language/fr/admin/dashboard.json index 3a4f7bf284..7328224f86 100644 --- a/public/language/fr/admin/dashboard.json +++ b/public/language/fr/admin/dashboard.json @@ -56,8 +56,8 @@ "active-users.total": "Total", "active-users.connections": "Connexions", - "guest-registered-users": "Guest vs Registered Users", - "guest": "Guest", + "guest-registered-users": "Utilisateurs invités vs enregistrés", + "guest": "Invité", "registered": "Enregistrés", "user-presence": "Présence des utilisateurs", @@ -68,7 +68,7 @@ "unread": "Non lus", "high-presence-topics": "Sujets populaires", - "popular-searches": "Popular Searches", + "popular-searches": "Recherches populaires", "graphs.page-views": "Pages vues", "graphs.page-views-registered": "Membres", @@ -76,14 +76,14 @@ "graphs.page-views-bot": "Robots", "graphs.unique-visitors": "Visiteurs uniques", "graphs.registered-users": "Utilisateurs enregistrés", - "graphs.guest-users": "Guest Users", + "graphs.guest-users": "Utilisateurs invités", "last-restarted-by": "Redémarré par", "no-users-browsing": "Aucun utilisateur connecté", "back-to-dashboard": "Retour au Tableau de bord", "details.no-users": "Aucun utilisateur ne s'est joint dans le délai sélectionné", "details.no-topics": "Aucun sujet n'a été publié dans la période sélectionnée", - "details.no-searches": "No searches have been made yet", + "details.no-searches": "Aucune recherche n'a encore été effectuée", "details.no-logins": "Aucune connexion n'a été enregistrée dans le délai sélectionné", "details.logins-static": "NodeBB n'enregistre que les données de session pendant %1 jours, et le tableau ci-dessous n'affichera donc que les dernières sessions actives", "details.logins-login-time": "Heure de connexion" diff --git a/public/language/fr/admin/manage/digest.json b/public/language/fr/admin/manage/digest.json index 0661b13ed8..2512debb1f 100644 --- a/public/language/fr/admin/manage/digest.json +++ b/public/language/fr/admin/manage/digest.json @@ -13,7 +13,7 @@ "resent-single": "Lettre d'activité envoyée", "resent-day": "Lettre d'activités quotidienne envoyée", "resent-week": "Lettre d'activité hebdomadaire envoyée", - "resent-biweek": "Bi-Weekly digest resent", + "resent-biweek": "Lettre d'activité envoyée deux fois par semaine", "resent-month": "Lettre d'activité mensuel envoyé", "null": "Jamais", "manual-run": "Lancer manuellement l'envoi:", diff --git a/public/language/fr/admin/menu.json b/public/language/fr/admin/menu.json index dc12d9e9e1..196f86ce5c 100644 --- a/public/language/fr/admin/menu.json +++ b/public/language/fr/admin/menu.json @@ -4,7 +4,7 @@ "dashboard/logins": "Connexions", "dashboard/users": "Utilisateurs", "dashboard/topics": "Sujets", - "dashboard/searches": "Searches", + "dashboard/searches": "Recherches", "section-general": "Général", "section-manage": "Gestion", diff --git a/public/language/fr/admin/settings/cookies.json b/public/language/fr/admin/settings/cookies.json index 797294c699..b337057dfc 100644 --- a/public/language/fr/admin/settings/cookies.json +++ b/public/language/fr/admin/settings/cookies.json @@ -4,7 +4,7 @@ "consent.message": "Message de notification", "consent.acceptance": "Message d'acceptation", "consent.link-text": "Texte du lien vers la politique de confidentialité", - "consent.link-url": "Policy Link URL", + "consent.link-url": "URL du lien Policy", "consent.blank-localised-default": "Laisser vide pour utiliser les textes localisés par défaut de NodeBB", "settings": "Réglages", "cookie-domain": "Domaine de session du cookie", diff --git a/public/language/fr/admin/settings/email.json b/public/language/fr/admin/settings/email.json index 1f5b030ed3..56956a04ca 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", "smtp-transport": "Protocole SMTP", - "smtp-transport.enabled": "Enable SMTP Transport", + "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é.", "smtp-transport.service": "Sélectionner un service", "smtp-transport.service-custom": "Service personnalisé", @@ -41,6 +41,6 @@ "require-email-address-warning": "Par défaut, les utilisateurs peuvent refuser de saisir une adresse e-mail. L'activation de cette option oblige de renseigner une une adresse e-mail lors de l'inscription. Ne garantit pas que l'utilisateur entrera adresse e-mail valide, ni même une adresse qu'il possède.", "include-unverified-emails": "Envoyer des mails aux destinataires qui n'ont pas explicitement confirmé leurs mails", "include-unverified-warning": "Par défaut, les utilisateurs dont les mails sont associés à leur compte ont déjà été vérifiés, mais il existe des situations où ce n'est pas le cas (par exemple, les connexions SSO, les utilisateurs bénéficiant de droits acquis, etc.). Activez ce paramètre à vos risques et périls – l'envoi de mails à des adresses non vérifiées peut constituer une violation des lois anti-spam régionales.", - "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." + "prompt": "Inviter les utilisateurs à saisir ou à confirmer leurs emails", + "prompt-help": "Si un utilisateur n'a pas défini d'email ou si son email n'est pas confirmé, un avertissement s'affichera à l'écran." } diff --git a/public/language/fr/admin/settings/general.json b/public/language/fr/admin/settings/general.json index 232e29037a..0f871bec8c 100644 --- a/public/language/fr/admin/settings/general.json +++ b/public/language/fr/admin/settings/general.json @@ -3,9 +3,9 @@ "title": "Titre du site", "title.short": "Titre court", "title.short-placeholder": "Si aucun titre court n'est spécifié, le titre du site sera utilisé", - "title.url": "Title Link URL", + "title.url": "URL du lien du titre", "title.url-placeholder": "URL du titre du site", - "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.
Note: This is not the external URL used in emails, etc. That is set by the url property in config.json", + "title.url-help": "Lorsque le titre est cliqué, il renvoi les utilisateurs à cette adresse. Si laissé vide, l'utilisateur sera envoyé à l'index du forum.
Remarque : il ne s'agit pas de l'URL externe utilisée dans les e-mails, etc. Elle est définie par la propriété url dans config.json", "title.name": "Nom de votre communauté", "title.show-in-header": "Afficher le titre du site dans l'en-tête", "browser-title": "Titre dans le navigateur", @@ -20,9 +20,9 @@ "logo.image": "Image", "logo.image-placeholder": "Chemin vers un logo à afficher dans l'en-tête du site", "logo.upload": "Télécharger", - "logo.url": "Logo Link URL", + "logo.url": "URL du lien du logo", "logo.url-placeholder": "L'URL du logo du site", - "logo.url-help": "When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index.
Note: This is not the external URL used in emails, etc. That is set by the url property in config.json", + "logo.url-help": "Lorsque le logo est cliqué, il renvoi les utilisateurs à cette adresse. Si laissé vide, l'utilisateur sera envoyé à l'index du forum.
Remarque : il ne s'agit pas de l'URL externe utilisée dans les e-mails, etc. Elle est définie par la propriété url dans config.json", "logo.alt-text": "Texte alternatif (alt)", "log.alt-text-placeholder": "Texte alternatif pour l'accessibilité", "favicon": "Favicon", diff --git a/public/language/fr/admin/settings/user.json b/public/language/fr/admin/settings/user.json index 722b013d4b..0a736319e6 100644 --- a/public/language/fr/admin/settings/user.json +++ b/public/language/fr/admin/settings/user.json @@ -71,7 +71,7 @@ "digest-freq.off": "Désactivé", "digest-freq.daily": "Quotidien", "digest-freq.weekly": "Hebdomadaire", - "digest-freq.biweekly": "Bi-Weekly", + "digest-freq.biweekly": "Deux fois par semaine", "digest-freq.monthly": "Mensuel", "email-chat-notifs": "Envoyer un e-mail si un nouveau message de chat arrive lorsque je ne suis pas en ligne", "email-post-notif": "Envoyer un email lors de réponses envoyées aux sujets auxquels que je suis", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 0da22c466c..6f53fa2605 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -34,8 +34,8 @@ "email-invited": "Cet utilisateur a déjà été invité.", "email-not-confirmed": "La publication dans certaines catégories ou sujets sera activée après confirmation de e-mail, veuillez cliquer ici pour envoyer un e-mail de confirmation.", "email-not-confirmed-chat": "Il ne vous est pas possible d'utiliser le chat tant que votre adresse email n'a pas été vérifiée. Veuillez cliquer ici pour confirmer votre adresse email.", - "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You may not be able to post in some categories or chat until your email is confirmed.", - "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery, and may be necessary for chatting and posting in some categories. Please click here to enter an email.", + "email-not-confirmed-email-sent": "Votre email n'a pas encore été confirmé, veuillez vérifier votre boîte mail. Vous ne pourrez pas poster ou discuter avant que votre email ne soit confirmé.", + "no-email-to-confirm": "Votre compte n'a pas d'adresse mail définie. Un mail est nécessaire pour la récupération du compte. Veuillez cliquer ici pour entrer un courriel.", "user-doesnt-have-email": "L'utilisateur « %1 » n'a pas d'adresse e-mail.", "email-confirm-failed": "Votre adresse email n'a pas pu être vérifiée. Veuillez ré-essayer plus tard.", "confirm-email-already-sent": "L'email de confirmation a déjà été envoyé. Veuillez attendre %1 minute(s) avant de redemander un nouvel envoi.", diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index f5cd794d55..c3157a0148 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -139,7 +139,7 @@ "composer.handle_placeholder": "Entrez votre nom/identifiant ici", "composer.discard": "Abandonner", "composer.submit": "Envoyer", - "composer.additional-options": "Additional Options", + "composer.additional-options": "Options additionnelles", "composer.schedule": "Planification", "composer.replying_to": "En réponse à %1", "composer.new_topic": "Nouveau sujet", diff --git a/public/language/fr/user.json b/public/language/fr/user.json index 17fbe49537..df75626619 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -94,7 +94,7 @@ "digest_off": "Désactivé", "digest_daily": "Quotidien", "digest_weekly": "Hebdomadaire", - "digest_biweekly": "Bi-Weekly", + "digest_biweekly": "Deux fois par semaine", "digest_monthly": "Mensuel", "has_no_follower": "Personne n'est abonné à cet utilisateur :(", "follows_no_one": "Cet utilisateur n'est abonné à personne :(", From 6a976a9db0340e34577961ce8d5d9479c78f7856 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 29 Oct 2021 10:56:03 -0400 Subject: [PATCH 14/95] fix: #9945, call authenticateRequest middleware for mount points in /api --- src/routes/api.js | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/routes/api.js b/src/routes/api.js index d80adc47ec..d2fdd340c9 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -6,29 +6,30 @@ const uploadsController = require('../controllers/uploads'); const helpers = require('./helpers'); module.exports = function (app, middleware, controllers) { + const middlewares = [middleware.authenticateRequest]; const router = express.Router(); app.use('/api', router); - router.get('/config', middleware.applyCSRF, middleware.authenticateRequest, helpers.tryRoute(controllers.api.getConfig)); + router.get('/config', [...middlewares, middleware.applyCSRF], helpers.tryRoute(controllers.api.getConfig)); - router.get('/self', helpers.tryRoute(controllers.user.getCurrentUser)); - router.get('/user/uid/:uid', middleware.canViewUsers, helpers.tryRoute(controllers.user.getUserByUID)); - router.get('/user/username/:username', middleware.canViewUsers, helpers.tryRoute(controllers.user.getUserByUsername)); - router.get('/user/email/:email', middleware.canViewUsers, helpers.tryRoute(controllers.user.getUserByEmail)); + router.get('/self', [...middlewares], helpers.tryRoute(controllers.user.getCurrentUser)); + router.get('/user/uid/:uid', [...middlewares, middleware.canViewUsers], helpers.tryRoute(controllers.user.getUserByUID)); + router.get('/user/username/:username', [...middlewares, middleware.canViewUsers], helpers.tryRoute(controllers.user.getUserByUsername)); + router.get('/user/email/:email', [...middlewares, middleware.canViewUsers], helpers.tryRoute(controllers.user.getUserByEmail)); - router.get('/user/uid/:userslug/export/posts', middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid, helpers.tryRoute(controllers.user.exportPosts)); - router.get('/user/uid/:userslug/export/uploads', middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid, helpers.tryRoute(controllers.user.exportUploads)); - router.get('/user/uid/:userslug/export/profile', middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid, helpers.tryRoute(controllers.user.exportProfile)); + router.get('/user/uid/:userslug/export/posts', [...middlewares, middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid], helpers.tryRoute(controllers.user.exportPosts)); + router.get('/user/uid/:userslug/export/uploads', [...middlewares, middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid], helpers.tryRoute(controllers.user.exportUploads)); + router.get('/user/uid/:userslug/export/profile', [...middlewares, middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid], helpers.tryRoute(controllers.user.exportProfile)); - router.get('/categories/:cid/moderators', helpers.tryRoute(controllers.api.getModerators)); - router.get('/recent/posts/:term?', helpers.tryRoute(controllers.posts.getRecentPosts)); - router.get('/unread/total', middleware.authenticateRequest, middleware.ensureLoggedIn, helpers.tryRoute(controllers.unread.unreadTotal)); - router.get('/topic/teaser/:topic_id', helpers.tryRoute(controllers.topics.teaser)); - router.get('/topic/pagination/:topic_id', helpers.tryRoute(controllers.topics.pagination)); + router.get('/categories/:cid/moderators', [...middlewares], helpers.tryRoute(controllers.api.getModerators)); + router.get('/recent/posts/:term?', [...middlewares], helpers.tryRoute(controllers.posts.getRecentPosts)); + router.get('/unread/total', [...middlewares, middleware.ensureLoggedIn], helpers.tryRoute(controllers.unread.unreadTotal)); + router.get('/topic/teaser/:topic_id', [...middlewares], helpers.tryRoute(controllers.topics.teaser)); + router.get('/topic/pagination/:topic_id', [...middlewares], helpers.tryRoute(controllers.topics.pagination)); const multipart = require('connect-multiparty'); const multipartMiddleware = multipart(); - const middlewares = [ + const postMiddlewares = [ middleware.maintenanceMode, multipartMiddleware, middleware.validateFiles, @@ -37,13 +38,13 @@ module.exports = function (app, middleware, controllers) { ]; router.post('/post/upload', middlewares, helpers.tryRoute(uploadsController.uploadPost)); - router.post('/user/:userslug/uploadpicture', - middlewares.concat([ - middleware.exposeUid, - middleware.authenticateRequest, - middleware.ensureLoggedIn, - middleware.canViewUsers, - middleware.checkAccountPermissions, - ]), - helpers.tryRoute(controllers.accounts.edit.uploadPicture)); + router.post('/user/:userslug/uploadpicture', [ + ...middlewares, + ...postMiddlewares, + middleware.exposeUid, + middleware.authenticateRequest, + middleware.ensureLoggedIn, + middleware.canViewUsers, + middleware.checkAccountPermissions, + ], helpers.tryRoute(controllers.accounts.edit.uploadPicture)); }; From 60352eca5462daeee144370d4db2d55118c0392d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 29 Oct 2021 11:16:37 -0400 Subject: [PATCH 15/95] fix: double invocation of authenticateRequest --- src/routes/api.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/api.js b/src/routes/api.js index d2fdd340c9..fa76030013 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -42,7 +42,6 @@ module.exports = function (app, middleware, controllers) { ...middlewares, ...postMiddlewares, middleware.exposeUid, - middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.canViewUsers, middleware.checkAccountPermissions, From 0ee85d5a0b6811d44ea53ac6e558c4317f7a107b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 29 Oct 2021 14:11:55 -0400 Subject: [PATCH 16/95] fix: #9950, rename account export routes to remove `uid/` prefix --- public/openapi/read.yaml | 14 ++++++++------ .../read/user/uid/userslug/export/type.yaml | 19 +++++++++++++++++++ .../user/{uid => }/userslug/export/posts.yaml | 0 .../{uid => }/userslug/export/profile.yaml | 0 .../{uid => }/userslug/export/uploads.yaml | 0 src/routes/api.js | 13 ++++++++++--- src/socket.io/user/profile.js | 2 +- 7 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 public/openapi/read/user/uid/userslug/export/type.yaml rename public/openapi/read/user/{uid => }/userslug/export/posts.yaml (100%) rename public/openapi/read/user/{uid => }/userslug/export/profile.yaml (100%) rename public/openapi/read/user/{uid => }/userslug/export/uploads.yaml (100%) diff --git a/public/openapi/read.yaml b/public/openapi/read.yaml index 857621dd86..2adc245b18 100644 --- a/public/openapi/read.yaml +++ b/public/openapi/read.yaml @@ -180,12 +180,14 @@ paths: $ref: 'read/user/username/username.yaml' "/api/user/email/{email}": $ref: 'read/user/email/email.yaml' - "/api/user/uid/{userslug}/export/posts": - $ref: 'read/user/uid/userslug/export/posts.yaml' - "/api/user/uid/{userslug}/export/uploads": - $ref: 'read/user/uid/userslug/export/uploads.yaml' - "/api/user/uid/{userslug}/export/profile": - $ref: 'read/user/uid/userslug/export/profile.yaml' + "/api/user/{userslug}/export/posts": + $ref: 'read/user/userslug/export/posts.yaml' + "/api/user/{userslug}/export/uploads": + $ref: 'read/user/userslug/export/uploads.yaml' + "/api/user/{userslug}/export/profile": + $ref: 'read/user/userslug/export/profile.yaml' + "/api/user/uid/{userslug}/export/{type}": + $ref: 'read/user/uid/userslug/export/type.yaml' /api/categories: $ref: 'read/categories.yaml' "/api/categories/{cid}/moderators": diff --git a/public/openapi/read/user/uid/userslug/export/type.yaml b/public/openapi/read/user/uid/userslug/export/type.yaml new file mode 100644 index 0000000000..f859087247 --- /dev/null +++ b/public/openapi/read/user/uid/userslug/export/type.yaml @@ -0,0 +1,19 @@ +get: + tags: + - deprecated + summary: Export a user's posts (.csv) + parameters: + - name: userslug + in: path + required: true + schema: + type: string + example: admin + responses: + "200": + description: "A CSV file containing a user's posts" + content: + text/csv: + schema: + type: string + format: binary \ No newline at end of file diff --git a/public/openapi/read/user/uid/userslug/export/posts.yaml b/public/openapi/read/user/userslug/export/posts.yaml similarity index 100% rename from public/openapi/read/user/uid/userslug/export/posts.yaml rename to public/openapi/read/user/userslug/export/posts.yaml diff --git a/public/openapi/read/user/uid/userslug/export/profile.yaml b/public/openapi/read/user/userslug/export/profile.yaml similarity index 100% rename from public/openapi/read/user/uid/userslug/export/profile.yaml rename to public/openapi/read/user/userslug/export/profile.yaml diff --git a/public/openapi/read/user/uid/userslug/export/uploads.yaml b/public/openapi/read/user/userslug/export/uploads.yaml similarity index 100% rename from public/openapi/read/user/uid/userslug/export/uploads.yaml rename to public/openapi/read/user/userslug/export/uploads.yaml diff --git a/src/routes/api.js b/src/routes/api.js index fa76030013..31871d1fc8 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -1,6 +1,7 @@ 'use strict'; const express = require('express'); +const winston = require('winston'); const uploadsController = require('../controllers/uploads'); const helpers = require('./helpers'); @@ -17,9 +18,15 @@ module.exports = function (app, middleware, controllers) { router.get('/user/username/:username', [...middlewares, middleware.canViewUsers], helpers.tryRoute(controllers.user.getUserByUsername)); router.get('/user/email/:email', [...middlewares, middleware.canViewUsers], helpers.tryRoute(controllers.user.getUserByEmail)); - router.get('/user/uid/:userslug/export/posts', [...middlewares, middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid], helpers.tryRoute(controllers.user.exportPosts)); - router.get('/user/uid/:userslug/export/uploads', [...middlewares, middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid], helpers.tryRoute(controllers.user.exportUploads)); - router.get('/user/uid/:userslug/export/profile', [...middlewares, middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid], helpers.tryRoute(controllers.user.exportProfile)); + router.get('/user/:userslug/export/posts', [...middlewares, middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid], helpers.tryRoute(controllers.user.exportPosts)); + router.get('/user/:userslug/export/uploads', [...middlewares, middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid], helpers.tryRoute(controllers.user.exportUploads)); + router.get('/user/:userslug/export/profile', [...middlewares, middleware.authenticateRequest, middleware.ensureLoggedIn, middleware.checkAccountPermissions, middleware.exposeUid], helpers.tryRoute(controllers.user.exportProfile)); + + // Deprecated, remove in v1.20.0 + router.get('/user/uid/:userslug/export/:type', (req, res) => { + winston.warn(`[router] \`/api/user/uid/${req.params.userslug}/export/${req.params.type}\` is deprecated, call it \`/api/user/${req.params.userslug}/export/${req.params.type}\`instead.`); + res.redirect(`/api/user/${req.params.userslug}/export/${req.params.type}`); + }); router.get('/categories/:cid/moderators', [...middlewares], helpers.tryRoute(controllers.api.getModerators)); router.get('/recent/posts/:term?', [...middlewares], helpers.tryRoute(controllers.posts.getRecentPosts)); diff --git a/src/socket.io/user/profile.js b/src/socket.io/user/profile.js index 2de4160ba5..0bce7240ff 100644 --- a/src/socket.io/user/profile.js +++ b/src/socket.io/user/profile.js @@ -140,7 +140,7 @@ module.exports = function (SocketUser) { const userData = await user.getUserFields(data.uid, ['username', 'userslug']); const n = await notifications.create({ bodyShort: `[[notifications:${type}-exported, ${userData.username}]]`, - path: `/api/user/uid/${userData.userslug}/export/${type}`, + path: `/api/user/${userData.userslug}/export/${type}`, nid: `${type}:export:${data.uid}`, from: data.uid, }); From 591424cea1d99a272bccfcfc8da603c6d977be1b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 29 Oct 2021 14:21:42 -0400 Subject: [PATCH 17/95] chore: fix type.yaml example and summary --- .../openapi/read/user/uid/userslug/export/type.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/openapi/read/user/uid/userslug/export/type.yaml b/public/openapi/read/user/uid/userslug/export/type.yaml index f859087247..e0ea7d93d1 100644 --- a/public/openapi/read/user/uid/userslug/export/type.yaml +++ b/public/openapi/read/user/uid/userslug/export/type.yaml @@ -1,7 +1,7 @@ get: tags: - deprecated - summary: Export a user's posts (.csv) + summary: Export a user's posts/profile/uploads (.csv) parameters: - name: userslug in: path @@ -10,10 +10,10 @@ get: type: string example: admin responses: - "200": - description: "A CSV file containing a user's posts" - content: - text/csv: + "302": + description: A redirect to the new URL format (without the `/uid` prefix) + headers: + Location: schema: type: string - format: binary \ No newline at end of file + example: /api/user/admin/export/posts \ No newline at end of file From 485b6ced1db9586e1cd3adfe8ca2de9906ca1970 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 29 Oct 2021 14:23:22 -0400 Subject: [PATCH 18/95] fix: broken post uploads due to 6a976a9db0340e34577961ce8d5d9479c78f7856 --- src/routes/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/api.js b/src/routes/api.js index 31871d1fc8..caab9c66a3 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -44,7 +44,7 @@ module.exports = function (app, middleware, controllers) { middleware.applyCSRF, ]; - router.post('/post/upload', middlewares, helpers.tryRoute(uploadsController.uploadPost)); + router.post('/post/upload', postMiddlewares, helpers.tryRoute(uploadsController.uploadPost)); router.post('/user/:userslug/uploadpicture', [ ...middlewares, ...postMiddlewares, From 10bb8cf747f2e09ea5790def7463b9e3aff49131 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 29 Oct 2021 15:18:40 -0400 Subject: [PATCH 19/95] test: fix account export test routes --- test/controllers.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/controllers.js b/test/controllers.js index e95840bf7b..452b43d302 100644 --- a/test/controllers.js +++ b/test/controllers.js @@ -1316,7 +1316,7 @@ describe('Controllers', () => { }); it('should export users posts', (done) => { - request(`${nconf.get('url')}/api/user/uid/foo/export/posts`, { jar: jar }, (err, res, body) => { + request(`${nconf.get('url')}/api/user/foo/export/posts`, { jar: jar }, (err, res, body) => { assert.ifError(err); assert.equal(res.statusCode, 200); assert(body); @@ -1325,7 +1325,7 @@ describe('Controllers', () => { }); it('should export users uploads', (done) => { - request(`${nconf.get('url')}/api/user/uid/foo/export/uploads`, { jar: jar }, (err, res, body) => { + request(`${nconf.get('url')}/api/user/foo/export/uploads`, { jar: jar }, (err, res, body) => { assert.ifError(err); assert.equal(res.statusCode, 200); assert(body); @@ -1334,7 +1334,7 @@ describe('Controllers', () => { }); it('should export users profile', (done) => { - request(`${nconf.get('url')}/api/user/uid/foo/export/profile`, { jar: jar }, (err, res, body) => { + request(`${nconf.get('url')}/api/user/foo/export/profile`, { jar: jar }, (err, res, body) => { assert.ifError(err); assert.equal(res.statusCode, 200); assert(body); From 1452557838f427e7a0f31df66948421712f68441 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sat, 30 Oct 2021 09:06:24 +0000 Subject: [PATCH 20/95] Latest translations and fallbacks --- public/language/vi/admin/dashboard.json | 10 +++++----- public/language/vi/admin/menu.json | 2 +- public/language/vi/admin/settings/email.json | 4 ++-- public/language/vi/error.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/language/vi/admin/dashboard.json b/public/language/vi/admin/dashboard.json index a3d4dc5c28..7ab9f47374 100644 --- a/public/language/vi/admin/dashboard.json +++ b/public/language/vi/admin/dashboard.json @@ -56,8 +56,8 @@ "active-users.total": "Tổng", "active-users.connections": "Kết nối", - "guest-registered-users": "Guest vs Registered Users", - "guest": "Guest", + "guest-registered-users": "Khách vs Người dùng đã đăng ký", + "guest": "Khách", "registered": "Đã đăng ký", "user-presence": "Người Dùng Có Mặt", @@ -68,7 +68,7 @@ "unread": "Chưa đọc", "high-presence-topics": "Chủ Đề Hiện Diện Cao", - "popular-searches": "Popular Searches", + "popular-searches": "Tìm kiếm Phổ biến", "graphs.page-views": "Xem Trang", "graphs.page-views-registered": "Đã Đăng Ký Xem Trang", @@ -76,14 +76,14 @@ "graphs.page-views-bot": "Bot Xem Trang", "graphs.unique-visitors": "Khách Truy Cập Duy Nhất", "graphs.registered-users": "Thành Viên Chính Thức", - "graphs.guest-users": "Guest Users", + "graphs.guest-users": "Người dùng khách", "last-restarted-by": "Khởi động lại lần cuối bởi", "no-users-browsing": "Người không xem bài", "back-to-dashboard": "Quay lại Bảng điều khiển", "details.no-users": "Không có người dùng nào tham gia trong khung thời gian đã chọn", "details.no-topics": "Không có chủ đề nào được đăng trong khung thời gian đã chọn", - "details.no-searches": "No searches have been made yet", + "details.no-searches": "Chưa có tìm kiếm nào", "details.no-logins": "Không có thông tin đăng nhập nào được ghi lại trong khung thời gian đã chọn", "details.logins-static": "NodeBB chỉ lưu dữ liệu phiên trong %1 ngày và do đó, bảng này bên dưới sẽ chỉ hiển thị các phiên hoạt động gần đây nhất", "details.logins-login-time": "Thời gian đăng nhập" diff --git a/public/language/vi/admin/menu.json b/public/language/vi/admin/menu.json index 2e71acff00..d44cc4d246 100644 --- a/public/language/vi/admin/menu.json +++ b/public/language/vi/admin/menu.json @@ -4,7 +4,7 @@ "dashboard/logins": "Đăng nhập", "dashboard/users": "Người dùng", "dashboard/topics": "Chủ đề", - "dashboard/searches": "Searches", + "dashboard/searches": "Tìm kiếm", "section-general": "Chung", "section-manage": "Quản lý", diff --git a/public/language/vi/admin/settings/email.json b/public/language/vi/admin/settings/email.json index 066d64e9f7..07682dcf26 100644 --- a/public/language/vi/admin/settings/email.json +++ b/public/language/vi/admin/settings/email.json @@ -41,6 +41,6 @@ "require-email-address-warning": "Mặc định, người dùng có thể chọn không nhập địa chỉ email. Bật tùy chọn này nghĩa là họ buộc phải nhập địa chỉ email để đăng ký. Việc này không chắc người dùng sẽ nhập địa chỉ email thực, hoặc không phải địa chỉ mà họ sở hữu.", "include-unverified-emails": "Gửi email đến những người nhận chưa xác nhận rõ ràng email của họ", "include-unverified-warning": "Theo mặc định, người dùng có email được liên kết với tài khoản của họ đã được xác minh, nhưng có những trường hợp không phải như vậy (ví dụ: đăng nhập SSO, người dùng phổ thông, v.v.). Bạn tự chịu rủi ro khi bật cài đặt này – gửi email đến các địa chỉ chưa được xác minh có thể vi phạm luật chống thư rác trong khu vực.", - "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." + "prompt": "Nhắc người dùng nhập hoặc xác nhận email của họ", + "prompt-help": "Nếu người dùng chưa cung cấp email hoặc email của họ chưa được xác nhận, một cảnh báo sẽ được hiển thị trên màn hình." } diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 6dd9b00f2d..8da98da748 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -34,8 +34,8 @@ "email-invited": "Email đã được mời", "email-not-confirmed": "Đăng trong một số danh mục hoặc chủ đề được bật sau khi email của bạn được xác nhận, vui lòng nhấp vào đây để gửi email xác nhận.", "email-not-confirmed-chat": "Bạn không thể trò chuyện cho đến khi email của bạn được xác nhận, vui lòng nhấp vào đây để xác nhận email của bạn.", - "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You may not be able to post in some categories or chat until your email is confirmed.", - "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery, and may be necessary for chatting and posting in some categories. Please click here to enter an email.", + "email-not-confirmed-email-sent": "Email của bạn vẫn chưa được xác nhận, vui lòng kiểm tra hộp thư đến của bạn để biết email xác nhận. Bạn có thể không đăng được trong một số danh mục hoặc trò chuyện cho đến khi email của bạn được xác nhận.", + "no-email-to-confirm": "Tài khoản của bạn chưa có email. Email cần dùng lúc khôi phục tài khoản và có thể cần để trò chuyện và đăng bài trong một số danh mục. Vui lòng bấm vào đây để nhập email.", "user-doesnt-have-email": "Người dùng \"%1\" chưa đặt email.", "email-confirm-failed": "Chúng tôi không thể xác nhận email của bạn, vui lòng thử lại sau.", "confirm-email-already-sent": "Email xác nhận đã được gửi, vui lòng chờ %1 phút để yêu cầu gửi lại.", From a7f235dbac4dfa23ad0b839a5d56331d0cdf7a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 31 Oct 2021 10:51:16 -0400 Subject: [PATCH 21/95] fix: topic events not rendered in infinitescroll --- public/src/client/topic/posts.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 0914497bb2..b84953e915 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -207,7 +207,8 @@ define('forum/topic/posts', [ app.parseAndTranslate('topic', 'posts', Object.assign({}, ajaxify.data, data), function (html) { html = html.filter(function () { const pid = $(this).attr('data-pid'); - return pid && $('[component="post"][data-pid="' + pid + '"]').length === 0; + const isPost = $(this).is('[component="post"]'); + return !isPost || (pid && $('[component="post"][data-pid="' + pid + '"]').length === 0); }); if (after) { From 89399c0ed511cc2ab60b2ccd0344b0e6741212bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 31 Oct 2021 15:09:33 -0400 Subject: [PATCH 22/95] fix: #9954, get next post timestamp fixes topic events being inserted in after first page but at the wrong spot --- public/src/modules/helpers.js | 2 +- src/topics/index.js | 17 +++++++++++++++++ src/topics/posts.js | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index b1778c92b1..34781ba92d 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -212,7 +212,7 @@ function renderTopicEvents(index) { const start = this.posts[index].timestamp; - const end = this.posts[index + 1] ? this.posts[index + 1].timestamp : Date.now(); + const end = this.posts[index].nextPostTimestamp; const events = this.events.filter(event => event.timestamp >= start && event.timestamp < end); if (!events.length) { return ''; diff --git a/src/topics/index.js b/src/topics/index.js index 85aa31aa2a..ddc432bfd4 100644 --- a/src/topics/index.js +++ b/src/topics/index.js @@ -240,9 +240,26 @@ async function getMainPostAndReplies(topic, set, uid, start, stop, reverse) { Topics.calculatePostIndices(replies, repliesStart); + await Topics.addNextPostTimestamp(postData, set, reverse); return await Topics.addPostData(postData, uid); } +Topics.addNextPostTimestamp = async function (postData, set, reverse) { + if (!postData.length) { + return; + } + postData.forEach((p, index) => { + if (p && postData[index + 1]) { + p.nextPostTimestamp = postData[index + 1].timestamp; + } + }); + const lastPost = postData[postData.length - 1]; + if (lastPost && lastPost.index) { + const data = await db[reverse ? 'getSortedSetRevRangeWithScores' : 'getSortedSetRangeWithScores'](set, lastPost.index, lastPost.index); + lastPost.nextPostTimestamp = data.length ? data[0].score : Date.now(); + } +}; + async function getDeleter(topicData) { if (!parseInt(topicData.deleterUid, 10)) { return null; diff --git a/src/topics/posts.js b/src/topics/posts.js index 2384dead48..dc947c6e67 100644 --- a/src/topics/posts.js +++ b/src/topics/posts.js @@ -24,6 +24,7 @@ module.exports = function (Topics) { const postData = await posts.getPostsFromSet(set, start, stop, uid, reverse); Topics.calculatePostIndices(postData, start); + await Topics.addNextPostTimestamp(postData, set, reverse); return await Topics.addPostData(postData, uid); }; From 3d611ab70eb9373d37e7752e08a71e9e8c7160f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 31 Oct 2021 16:13:16 -0400 Subject: [PATCH 23/95] fix: events for just topic with main post --- src/topics/index.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/topics/index.js b/src/topics/index.js index ddc432bfd4..06a6879c6c 100644 --- a/src/topics/index.js +++ b/src/topics/index.js @@ -254,9 +254,12 @@ Topics.addNextPostTimestamp = async function (postData, set, reverse) { } }); const lastPost = postData[postData.length - 1]; - if (lastPost && lastPost.index) { - const data = await db[reverse ? 'getSortedSetRevRangeWithScores' : 'getSortedSetRangeWithScores'](set, lastPost.index, lastPost.index); - lastPost.nextPostTimestamp = data.length ? data[0].score : Date.now(); + if (lastPost) { + lastPost.nextPostTimestamp = Date.now(); + if (lastPost.index) { + const data = await db[reverse ? 'getSortedSetRevRangeWithScores' : 'getSortedSetRangeWithScores'](set, lastPost.index, lastPost.index); + lastPost.nextPostTimestamp = data.length ? data[0].score : lastPost.nextPostTimestamp; + } } }; From 2ca40c672918b9dd75604ad5bab322454c03a21c Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Mon, 1 Nov 2021 09:07:17 +0000 Subject: [PATCH 24/95] Latest translations and fallbacks --- public/language/it/admin/settings/email.json | 4 ++-- public/language/it/error.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/language/it/admin/settings/email.json b/public/language/it/admin/settings/email.json index b203c44bfb..2d2eae1612 100644 --- a/public/language/it/admin/settings/email.json +++ b/public/language/it/admin/settings/email.json @@ -41,6 +41,6 @@ "require-email-address-warning": "Per impostazione predefinita, gli utenti possono rinunciare a inserire un indirizzo email. Abilitare questa opzione significa che devono inserire un indirizzo email per procedere con la registrazione. Non assicura che l'utente inserisca un indirizzo email reale, e nemmeno un indirizzo che possiede.", "include-unverified-emails": "Invia email a destinatari che non hanno confermato esplicitamente le loro email", "include-unverified-warning": "Per impostazione predefinita, gli utenti con email associate al loro account sono già stati verificati, ma ci sono situazioni in cui ciò non è vero (ad esempio accessi SSO, vecchi utenti, ecc.). Abilita questa impostazione a tuo rischio e pericolo – l'invio di email a indirizzi non verificati può essere una violazione delle leggi regionali anti-spam.", - "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." + "prompt": "Chiedi agli utenti di inserire o confermare le loro email", + "prompt-help": "Se un utente non ha impostato un'email, o la sua email non è confermata, sarà mostrato un avviso sullo schermo." } diff --git a/public/language/it/error.json b/public/language/it/error.json index f05b5a3e1e..2ce566199d 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -34,8 +34,8 @@ "email-invited": "L'email è già stata invitata", "email-not-confirmed": "Sarai abilitato a postare in alcune categorie o discussioni una volta che la tua email sarà confermata, per favore clicca qui per inviare una email di conferma.", "email-not-confirmed-chat": "Non puoi chattare finché non confermi la tua email, per favore clicca qui per confermare la tua email.", - "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You may not be able to post in some categories or chat until your email is confirmed.", - "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery, and may be necessary for chatting and posting in some categories. Please click here to enter an email.", + "email-not-confirmed-email-sent": "La tua email non è stata ancora confermata, controlla la tua casella di posta per l'email di conferma. Potresti non essere in grado di postare in alcune categorie o chattare fino a quando la tua email non sarà confermata.", + "no-email-to-confirm": "Il tuo account non ha un'email impostata. Un'email è necessaria per il recupero dell'account, e può essere necessaria per chattare e postare in alcune categorie. Clicca qui per inserire un'email.", "user-doesnt-have-email": "L'utente \"%1\" non ha impostato un email.", "email-confirm-failed": "Non abbiamo potuto confermare la tua email, per favore riprovaci più tardi.", "confirm-email-already-sent": "Email di conferma già inviata, per favore attendere %1 minuto(i) per inviarne un'altra.", From 7d468e7203db0573ff0c64dcaa799628fc9302a4 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 1 Nov 2021 16:49:25 +0000 Subject: [PATCH 25/95] chore(deps): update dependency jsdom to v18.0.1 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 1ef42043c1..b825f4a98f 100644 --- a/install/package.json +++ b/install/package.json @@ -151,7 +151,7 @@ "grunt": "1.4.1", "grunt-contrib-watch": "1.1.0", "husky": "7.0.4", - "jsdom": "18.0.0", + "jsdom": "18.0.1", "lint-staged": "11.2.6", "mocha": "9.1.3", "mocha-lcov-reporter": "1.3.0", From 8c67031609da30d788561459f8bb76e9a69253de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 1 Nov 2021 15:09:05 -0400 Subject: [PATCH 26/95] feat: show posts previews if enabled on mouse over --- install/data/defaults.json | 1 + .../language/en-GB/admin/settings/post.json | 1 + public/src/client/topic.js | 57 ++++++++++++++++++- src/controllers/topics.js | 1 + src/socket.io/posts.js | 16 ++++++ src/views/admin/settings/post.tpl | 6 ++ src/views/partials/topic/post-preview.tpl | 13 +++++ 7 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 src/views/partials/topic/post-preview.tpl diff --git a/install/data/defaults.json b/install/data/defaults.json index 3b92872280..52b7683954 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -69,6 +69,7 @@ "gdpr_enabled": 1, "allowProfileImageUploads": 1, "teaserPost": "last-reply", + "showPostPreviewsOnHover": 1, "allowPrivateGroups": 1, "unreadCutoff": 2, "bookmarkThreshold": 5, diff --git a/public/language/en-GB/admin/settings/post.json b/public/language/en-GB/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/en-GB/admin/settings/post.json +++ b/public/language/en-GB/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 6fe0310dd6..6661b43d65 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -12,10 +12,11 @@ define('forum/topic', [ 'components', 'storage', 'hooks', + 'api', ], function ( infinitescroll, threadTools, postTools, events, posts, navigator, sort, - components, storage, hooks + components, storage, hooks, api ) { const Topic = {}; let currentUrl = ''; @@ -55,6 +56,7 @@ define('forum/topic', [ addParentHandler(); addDropupHandler(); addRepliesHandler(); + addPostsPreviewHandler(); handleBookmark(tid); @@ -172,6 +174,59 @@ define('forum/topic', [ }); } + function addPostsPreviewHandler() { + if (!ajaxify.data.showPostPreviewsOnHover) { + return; + } + let timeoutId = 0; + $('[component="topic"]').on('mouseenter', '[component="post"] a, [component="topic/event"] a', async function () { + const link = $(this); + + async function renderPost(pid) { + const postData = await socket.emit('posts.getPostSummaryByPid', { pid: pid }); + if (postData) { + const tooltip = await app.parseAndTranslate('partials/topic/post-preview', { post: postData }); + tooltip.hide().find('.timeago').timeago(); + tooltip.appendTo($('body')).fadeIn(300); + const postContent = link.parents('[component="topic"]').find('[component="post/content"]').first(); + const postRect = postContent.offset(); + const postWidth = postContent.width(); + const linkRect = link.offset(); + tooltip.css({ + top: linkRect.top + 30, + left: postRect.left, + width: postWidth, + }); + } + } + + const href = link.attr('href'); + const pathname = utils.urlToLocation(href).pathname; + $('#post-tooltip').remove(); + const postMatch = pathname && pathname.match(/\/post\/([\d]+)/); + const topicMatch = pathname && pathname.match(/\/topic\/([\d]+)/); + if (postMatch) { + const pid = postMatch[1]; + if (parseInt(link.parents('[component="post"]').attr('data-pid'), 10) === parseInt(pid, 10)) { + return; // dont render self post + } + + timeoutId = setTimeout(async () => { + renderPost(pid); + }, 300); + } else if (topicMatch) { + timeoutId = setTimeout(async () => { + const tid = topicMatch[1]; + const topicData = await api.get('/topics/' + tid, {}); + renderPost(topicData.mainPid); + }, 300); + } + }).on('mouseleave', '[component="post"] a, [component="topic/event"] a', function () { + clearTimeout(timeoutId); + $('#post-tooltip').remove(); + }); + } + function updateTopicTitle() { const span = components.get('navbar/title').find('span'); if ($(window).scrollTop() > 50 && span.hasClass('hidden')) { diff --git a/src/controllers/topics.js b/src/controllers/topics.js index fa7a9b6d68..291acf78cf 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -96,6 +96,7 @@ topicsController.get = async function getTopic(req, res, next) { topicData.updateUrlWithPostIndex = settings.updateUrlWithPostIndex; topicData.allowMultipleBadges = meta.config.allowMultipleBadges === 1; topicData.privateUploads = meta.config.privateUploads === 1; + topicData.showPostPreviewsOnHover = meta.config.showPostPreviewsOnHover === 1; topicData.rssFeedUrl = `${relative_path}/topic/${topicData.tid}.rss`; if (req.loggedIn) { topicData.rssFeedUrl += `?uid=${req.uid}&token=${rssToken}`; diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index a4ab025cc4..9fc33293cf 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -98,6 +98,22 @@ SocketPosts.getPostSummaryByIndex = async function (socket, data) { return postsData[0]; }; +SocketPosts.getPostSummaryByPid = async function (socket, data) { + if (!data || !data.pid) { + throw new Error('[[error:invalid-data]]'); + } + const { pid } = data; + const tid = await posts.getPostField(pid, 'tid'); + const topicPrivileges = await privileges.topics.get(tid, socket.uid); + if (!topicPrivileges['topics:read']) { + throw new Error('[[error:no-privileges]]'); + } + + const postsData = await posts.getPostSummaryByPids([pid], socket.uid, { stripTags: false }); + posts.modifyPostByPrivilege(postsData[0], topicPrivileges); + return postsData[0]; +}; + SocketPosts.getPost = async function (socket, pid) { sockets.warnDeprecated(socket, 'GET /api/v3/posts/:pid'); return await api.posts.get(socket, { pid }); diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl index 8e7029e906..6c018ec974 100644 --- a/src/views/admin/settings/post.tpl +++ b/src/views/admin/settings/post.tpl @@ -193,6 +193,12 @@ +
+ +
diff --git a/src/views/partials/topic/post-preview.tpl b/src/views/partials/topic/post-preview.tpl new file mode 100644 index 0000000000..666313112c --- /dev/null +++ b/src/views/partials/topic/post-preview.tpl @@ -0,0 +1,13 @@ +
+
+
+ + {buildAvatar(post.user, "sm", true, "", "user/picture")} {post.user.username} + +
+ + + +
+
{post.content}
+
From 46789910a81de8d5ecb6ca3fec6cc9f1444808e3 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Mon, 1 Nov 2021 19:09:49 +0000 Subject: [PATCH 27/95] chore(i18n): fallback strings for new resources: nodebb.admin-settings-post --- public/language/ar/admin/settings/post.json | 1 + public/language/bg/admin/settings/post.json | 1 + public/language/bn/admin/settings/post.json | 1 + public/language/cs/admin/settings/post.json | 1 + public/language/da/admin/settings/post.json | 1 + public/language/de/admin/settings/post.json | 1 + public/language/el/admin/settings/post.json | 1 + public/language/en-US/admin/settings/post.json | 1 + public/language/en-x-pirate/admin/settings/post.json | 1 + public/language/es/admin/settings/post.json | 1 + public/language/et/admin/settings/post.json | 1 + public/language/fa-IR/admin/settings/post.json | 1 + public/language/fi/admin/settings/post.json | 1 + public/language/fr/admin/settings/post.json | 1 + public/language/gl/admin/settings/post.json | 1 + public/language/he/admin/settings/post.json | 1 + public/language/hr/admin/settings/post.json | 1 + public/language/hu/admin/settings/post.json | 1 + public/language/id/admin/settings/post.json | 1 + public/language/it/admin/settings/post.json | 1 + public/language/ja/admin/settings/post.json | 1 + public/language/ko/admin/settings/post.json | 1 + public/language/lt/admin/settings/post.json | 1 + public/language/lv/admin/settings/post.json | 1 + public/language/ms/admin/settings/post.json | 1 + public/language/nb/admin/settings/post.json | 1 + public/language/nl/admin/settings/post.json | 1 + public/language/pl/admin/settings/post.json | 1 + public/language/pt-BR/admin/settings/post.json | 1 + public/language/pt-PT/admin/settings/post.json | 1 + public/language/ro/admin/settings/post.json | 1 + public/language/ru/admin/settings/post.json | 1 + public/language/rw/admin/settings/post.json | 1 + public/language/sc/admin/settings/post.json | 1 + public/language/sk/admin/settings/post.json | 1 + public/language/sl/admin/settings/post.json | 1 + public/language/sr/admin/settings/post.json | 1 + public/language/sv/admin/settings/post.json | 1 + public/language/th/admin/settings/post.json | 1 + public/language/tr/admin/settings/post.json | 1 + public/language/uk/admin/settings/post.json | 1 + public/language/vi/admin/settings/post.json | 1 + public/language/zh-CN/admin/settings/post.json | 1 + public/language/zh-TW/admin/settings/post.json | 1 + 44 files changed, 44 insertions(+) diff --git a/public/language/ar/admin/settings/post.json b/public/language/ar/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/ar/admin/settings/post.json +++ b/public/language/ar/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/bg/admin/settings/post.json b/public/language/bg/admin/settings/post.json index 4f41a2cd57..6c80b214c2 100644 --- a/public/language/bg/admin/settings/post.json +++ b/public/language/bg/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Последната – Показване на последната публикация, или първоначалната такава, ако няма отговори.", "teaser.last-reply": "Последната – Показване на последния отговор, или „Няма отговори“, ако все още няма такива.", "teaser.first": "Първата", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Настройки за непрочетените", "unread.cutoff": "Възраст на публикациите, след която те не се показват в непрочетените (в брой дни)", "unread.min-track-last": "Минимален брой публикации в темата, след което да започва следене на последно прочетената", diff --git a/public/language/bn/admin/settings/post.json b/public/language/bn/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/bn/admin/settings/post.json +++ b/public/language/bn/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/cs/admin/settings/post.json b/public/language/cs/admin/settings/post.json index a76f6b446f..eb89abb569 100644 --- a/public/language/cs/admin/settings/post.json +++ b/public/language/cs/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Poslední – zobrazení posledního příspěvku, včetně hlavního příspěvku, nejsou-li odpovědi", "teaser.last-reply": "Poslední – zobrazení poslední odpovědi, nebo nejsou-li žádné odpovědi textu „Bez odpovědi”", "teaser.first": "První", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Nastavení nepřečtených", "unread.cutoff": "Dny ukončení nepřečtených", "unread.min-track-last": "Minimální počet příspěvků v tématu před posledním čtením", diff --git a/public/language/da/admin/settings/post.json b/public/language/da/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/da/admin/settings/post.json +++ b/public/language/da/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/de/admin/settings/post.json b/public/language/de/admin/settings/post.json index 09f5c41b56..9aa327bad0 100644 --- a/public/language/de/admin/settings/post.json +++ b/public/language/de/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Letzter - Den neuesten Beitrag anzeigen, den originalen Beitrag innbegriffen, wenn es keine Antworten gibt", "teaser.last-reply": "Letzter - Den neuesten Beitrag oder einen \"Keine Antworten\" Platzhalter, wenn es keine Antworten gibt anzeigen", "teaser.first": "Erster", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Ungelesen-Einstellungen", "unread.cutoff": "Ungelesen-Limit (in Tagen)", "unread.min-track-last": "Minimale Anzahl an Beiträgen pro Thema bevor die letzte Sichtung mitgeschrieben wird", diff --git a/public/language/el/admin/settings/post.json b/public/language/el/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/el/admin/settings/post.json +++ b/public/language/el/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/en-US/admin/settings/post.json b/public/language/en-US/admin/settings/post.json index 05656c9fba..b4d89f389a 100644 --- a/public/language/en-US/admin/settings/post.json +++ b/public/language/en-US/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/en-x-pirate/admin/settings/post.json b/public/language/en-x-pirate/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/en-x-pirate/admin/settings/post.json +++ b/public/language/en-x-pirate/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/es/admin/settings/post.json b/public/language/es/admin/settings/post.json index 72e094800d..eec90ff156 100644 --- a/public/language/es/admin/settings/post.json +++ b/public/language/es/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Último – Muestra la última entrada, incluyendo la entrada original, si no hay respuestas.", "teaser.last-reply": "Última – Muestra la última respuesta, o un texto \"No hay respuestas\" si no hay respuestas.", "teaser.first": "Primera", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Configuraciones sin leer", "unread.cutoff": "Días límite sin leer", "unread.min-track-last": "Entradas mínimas en un tema antes de indicar la última leída.", diff --git a/public/language/et/admin/settings/post.json b/public/language/et/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/et/admin/settings/post.json +++ b/public/language/et/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/fa-IR/admin/settings/post.json b/public/language/fa-IR/admin/settings/post.json index 57fd21e92f..d07c92aa9d 100644 --- a/public/language/fa-IR/admin/settings/post.json +++ b/public/language/fa-IR/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/fi/admin/settings/post.json b/public/language/fi/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/fi/admin/settings/post.json +++ b/public/language/fi/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/fr/admin/settings/post.json b/public/language/fr/admin/settings/post.json index 8c033dcd9e..96ef48543c 100644 --- a/public/language/fr/admin/settings/post.json +++ b/public/language/fr/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Dernier – Affiche le dernier message, ou celui d'origine, si il n'y a pas de réponse", "teaser.last-reply": "Dernier – Affiche le dernier message, ou \"Aucune réponse\" si il n'y a pas de réponse", "teaser.first": "Premier", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Paramètres des messages non lus", "unread.cutoff": "Nombre de jours pour les messages non-lus", "unread.min-track-last": "Nombre minimum de messages dans le sujet avant de garder en mémoire le dernier message lu", diff --git a/public/language/gl/admin/settings/post.json b/public/language/gl/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/gl/admin/settings/post.json +++ b/public/language/gl/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/he/admin/settings/post.json b/public/language/he/admin/settings/post.json index f2f1611796..a3c9ad12a9 100644 --- a/public/language/he/admin/settings/post.json +++ b/public/language/he/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – הצג את הפוסט האחרון, כולל הפוסט המקורי, אם אין תגובות", "teaser.last-reply": "Last – הצג את התשובה האחרונה, או ציין \"ללא תשובות\" אם אין תשובות", "teaser.first": "ראשון", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "הגדרות \"שלא נקראו\"", "unread.cutoff": "ימי ניתוק שלא נקראו", "unread.min-track-last": "פוסטים מינימליים בנושא לפני מעקב אחר קריאה אחרונה", diff --git a/public/language/hr/admin/settings/post.json b/public/language/hr/admin/settings/post.json index b32357dc51..21e8c03071 100644 --- a/public/language/hr/admin/settings/post.json +++ b/public/language/hr/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "Prvi", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Nepročitane postavke", "unread.cutoff": "Nepročitano dani prekinutosti", "unread.min-track-last": "Minimalni broj objava u temi prije praćenja zadnje pročitanog", diff --git a/public/language/hu/admin/settings/post.json b/public/language/hu/admin/settings/post.json index 2bae9b654e..0bdf3d228b 100644 --- a/public/language/hu/admin/settings/post.json +++ b/public/language/hu/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Utolsó – Utolsó hozzászólás megjelenítése, az eredeti hozzászólást is beleértve, ha nincsenek válaszok", "teaser.last-reply": "Utolsó – Utolsó válasz vagy, ha nincsenek válaszok, akkor \"Nincs válasz\" szöveg megjelenítése", "teaser.first": "Első", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Olvasatlansági beállítások", "unread.cutoff": "Hány napig legyen olvasatlan egy hozzászólás", "unread.min-track-last": "Hozzászólások minimális száma egy témakörben, mielőtt a legutóbbi olvasás követése elkezdődik", diff --git a/public/language/id/admin/settings/post.json b/public/language/id/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/id/admin/settings/post.json +++ b/public/language/id/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/it/admin/settings/post.json b/public/language/it/admin/settings/post.json index 5cbea6601b..0513f2fdfe 100644 --- a/public/language/it/admin/settings/post.json +++ b/public/language/it/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Ultimo – Mostra l'ultimo post, incluso il post originale, se non ci sono risposte", "teaser.last-reply": "Ultimo – Mostra l'ultima risposta o un segnaposto \"Nessuna risposta\" se non risposto", "teaser.first": "Primo", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Impostazioni non Lette", "unread.cutoff": "Giorni di interruzione non letti", "unread.min-track-last": "Post minimi nell'argomento prima del monitoraggio dell'ultima lettura", diff --git a/public/language/ja/admin/settings/post.json b/public/language/ja/admin/settings/post.json index 43cd02324a..8c0502c8d2 100644 --- a/public/language/ja/admin/settings/post.json +++ b/public/language/ja/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "最後＆ndash;返信がない場合は、元の投稿を含む最新の投稿を表示", "teaser.last-reply": "最後＆ndash;最新の返信を表示するか、返信がない場合は「返信なし」のプレースホルダを表示する", "teaser.first": "最初", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "未読の設定", "unread.cutoff": "未読のカットオフ日", "unread.min-track-last": "最後に読み込みを行う前に追跡するスレッドの最小投稿数", diff --git a/public/language/ko/admin/settings/post.json b/public/language/ko/admin/settings/post.json index ef7b8ab1c6..a2ea9e3e67 100644 --- a/public/language/ko/admin/settings/post.json +++ b/public/language/ko/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "최근 - 최근 작성된 포스트를 보여주고 답글이 없을 경우 포스트 본문 보여주기", "teaser.last-reply": "최근 - 최근 작성된 답글을 보여주고 답글이 없을 경우 \"답글 없음\" 표시", "teaser.first": "첫 글", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "읽지 않음 목록 설정", "unread.cutoff": "읽지 않음 표시 기간", "unread.min-track-last": "마지막으로 읽은 글 추적 기능을 사용할 최소 글 수", diff --git a/public/language/lt/admin/settings/post.json b/public/language/lt/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/lt/admin/settings/post.json +++ b/public/language/lt/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/lv/admin/settings/post.json b/public/language/lv/admin/settings/post.json index 51c48dc131..a6dfd4826c 100644 --- a/public/language/lv/admin/settings/post.json +++ b/public/language/lv/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Pēdējo – rādīt jaunāko rakstu, ieskaitot sākotnējo rakstu, ja atbildes nav", "teaser.last-reply": "Pēdējo – rādīt jaunāko atbildi, vai \"Nav atbildes\" tekstu, ja atbildes nav", "teaser.first": "Pirmais", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Nelasītie raksti", "unread.cutoff": "Nelasīto rakstu vecumu robeža", "unread.min-track-last": "Minimālais rakstu skaits tematā pirms izseko pēdējo lasīto", diff --git a/public/language/ms/admin/settings/post.json b/public/language/ms/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/ms/admin/settings/post.json +++ b/public/language/ms/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/nb/admin/settings/post.json b/public/language/nb/admin/settings/post.json index 30a0e25fed..5e2ca5e30a 100644 --- a/public/language/nb/admin/settings/post.json +++ b/public/language/nb/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum antall innlegg i tråd før registrering av sist lest", diff --git a/public/language/nl/admin/settings/post.json b/public/language/nl/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/nl/admin/settings/post.json +++ b/public/language/nl/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/pl/admin/settings/post.json b/public/language/pl/admin/settings/post.json index 7659b24546..9374e26e45 100644 --- a/public/language/pl/admin/settings/post.json +++ b/public/language/pl/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Ostatni – Pokaż ostatni post, włączając pierwszy post, w razie braku odpowiedzi", "teaser.last-reply": "Ostatni – Pokaż ostatnią odpowiedź lub komunikat „Brak odpowiedzi” w razie ich braku", "teaser.first": "Pierwszy", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Ustawienia nieprzeczytanych", "unread.cutoff": "Dni do odcięcia nieprzeczytanych ", "unread.min-track-last": "Minimalna liczba postów w temacie przed śledzeniem ostatnio przeczytanego", diff --git a/public/language/pt-BR/admin/settings/post.json b/public/language/pt-BR/admin/settings/post.json index 6bfc361519..2f9be57f91 100644 --- a/public/language/pt-BR/admin/settings/post.json +++ b/public/language/pt-BR/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Último – Exibir o último post, incluindo o post original, se não houver respostas", "teaser.last-reply": "Último – Exibir a última resposta, ou um marcador \"Sem respostas\" se não houver respostas", "teaser.first": "Primeiro", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Configurações de Não-Lidos", "unread.cutoff": "Data de corte de não-lidos", "unread.min-track-last": "Mínimo de posts no tópico antes de rastrear o último lido", diff --git a/public/language/pt-PT/admin/settings/post.json b/public/language/pt-PT/admin/settings/post.json index 7e04a1cf14..df1b464869 100644 --- a/public/language/pt-PT/admin/settings/post.json +++ b/public/language/pt-PT/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/ro/admin/settings/post.json b/public/language/ro/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/ro/admin/settings/post.json +++ b/public/language/ro/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/ru/admin/settings/post.json b/public/language/ru/admin/settings/post.json index 86f7ee90a0..a3ebd45ffc 100644 --- a/public/language/ru/admin/settings/post.json +++ b/public/language/ru/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Последнее – показать последнее сообщение в теме (первое, если ответов нет).", "teaser.last-reply": "Последнее – показать последнее сообщение или пометку «Ответов нет»", "teaser.first": "Первое сообщение", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Настройка списка непрочитанных тем", "unread.cutoff": "Порог отсечки (в днях)", "unread.min-track-last": "Минимальное кол-во сообщений в теме, чтобы начать отслеживать непрочитанные ответы", diff --git a/public/language/rw/admin/settings/post.json b/public/language/rw/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/rw/admin/settings/post.json +++ b/public/language/rw/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/sc/admin/settings/post.json b/public/language/sc/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/sc/admin/settings/post.json +++ b/public/language/sc/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/sk/admin/settings/post.json b/public/language/sk/admin/settings/post.json index 8ebf0cc3d1..8c4f8419f0 100644 --- a/public/language/sk/admin/settings/post.json +++ b/public/language/sk/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Posledný - zobrazenie posledného príspevku, vrátane hlavného príspevku, ak nie sú odpovede", "teaser.last-reply": "Posledný - zobrazenie poslednej odpovede, alebo ak nie sú žiadne odpovede textu „Bez odpovede”", "teaser.first": "Prvý", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Nastavenia neprečítaných", "unread.cutoff": "Dni ukončenia neprečítaných", "unread.min-track-last": "Minimálny počet príspevkov v téme pred posledným prečítaním", diff --git a/public/language/sl/admin/settings/post.json b/public/language/sl/admin/settings/post.json index 424104587e..a0ff22173d 100644 --- a/public/language/sl/admin/settings/post.json +++ b/public/language/sl/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Zadnja – Prikaži najnovejšo objavo, vključno z izvirno, če ni odgovorov", "teaser.last-reply": "Zadnja – Prikaži najnovejši odgovor ali \"Ni odgovorov\", če ni odgovorov", "teaser.first": "Prvi", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Neprebrane nastavitve", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Najmanjše število objav v temi pred sledenjem zadnjem branju", diff --git a/public/language/sr/admin/settings/post.json b/public/language/sr/admin/settings/post.json index c1a2a7003b..beba2775b7 100644 --- a/public/language/sr/admin/settings/post.json +++ b/public/language/sr/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Poslednji &ndashč Pokazuje poslednji post, uključujući originalni post, ako nema odgovora", "teaser.last-reply": "Poslednji &ndashč Pokaži najnoviji odgovor, ili ako \"Nema odgovora\" placeholder ako nema odgovora", "teaser.first": "Prvi", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Nepročitana podešavanja", "unread.cutoff": "Nepročitano tokom prekinutih dana", "unread.min-track-last": "Minimum postova u temi, pre praćenja poslednjeg pročitanog", diff --git a/public/language/sv/admin/settings/post.json b/public/language/sv/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/sv/admin/settings/post.json +++ b/public/language/sv/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/th/admin/settings/post.json b/public/language/th/admin/settings/post.json index 00baa56fc1..ab8245738c 100644 --- a/public/language/th/admin/settings/post.json +++ b/public/language/th/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", "teaser.first": "First", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Unread Settings", "unread.cutoff": "Unread cutoff days", "unread.min-track-last": "Minimum posts in topic before tracking last read", diff --git a/public/language/tr/admin/settings/post.json b/public/language/tr/admin/settings/post.json index 8eb9aba208..8428df7f38 100644 --- a/public/language/tr/admin/settings/post.json +++ b/public/language/tr/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Son – cevap yoksa orijinal gönderi de dahil olmak üzere en son gönderiyi gösterir.", "teaser.last-reply": "Son – cevap yoksa en son yanıtı veya \"Yanıt yok\" yertutucusunu gösterir.", "teaser.first": "İlk", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Okunmamış Ayarları", "unread.cutoff": "Okunmamış gün sınırı", "unread.min-track-last": "Son okumayı takip etmeden önce konuya yapılan asgari gönderim", diff --git a/public/language/uk/admin/settings/post.json b/public/language/uk/admin/settings/post.json index 5219e9aded..ba23e93c33 100644 --- a/public/language/uk/admin/settings/post.json +++ b/public/language/uk/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Останній — показувати останній пост або перший, якщо немає відповідей", "teaser.last-reply": "Останній — показувати останній пост або \"Немає відповідей\", якщо немає відповідей", "teaser.first": "Перший", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Налаштування непрочитаних", "unread.cutoff": "За скільки днів показувати непрочитані", "unread.min-track-last": "Мінімальна кількість постів у темі перш ніж відслідковувати останні прочитані", diff --git a/public/language/vi/admin/settings/post.json b/public/language/vi/admin/settings/post.json index 1db0f903f1..983c9f0902 100644 --- a/public/language/vi/admin/settings/post.json +++ b/public/language/vi/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "Gần đây – Hiển thị bài đăng mới nhất, bao gồm cả bài gốc, nếu không có câu trả lời", "teaser.last-reply": "Cuối cùng - Hiển thị câu trả lời mới nhất hoặc trình giữ chỗ \"Không trả lời\" nếu không có câu trả lời", "teaser.first": "Đầu tiên", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "Cài Đặt Chưa Đọc", "unread.cutoff": "Số ngày giới hạn chưa đọc", "unread.min-track-last": "Số bài viết tối thiểu trong chủ đề trước khi theo dõi lần đọc cuối cùng", diff --git a/public/language/zh-CN/admin/settings/post.json b/public/language/zh-CN/admin/settings/post.json index 7dc59bb94b..2d66c6b6ac 100644 --- a/public/language/zh-CN/admin/settings/post.json +++ b/public/language/zh-CN/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "最后– 显示最新的帖子，包括原帖，如果没有回复", "teaser.last-reply": "最后– 显示最新回复，如果没有回复，则显示“无回复”占位符", "teaser.first": "第一", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "未读设置", "unread.cutoff": "未读截止时间（天）", "unread.min-track-last": "跟踪最后阅读之前的主题最小帖子", diff --git a/public/language/zh-TW/admin/settings/post.json b/public/language/zh-TW/admin/settings/post.json index 607923bae4..057bfe0e6b 100644 --- a/public/language/zh-TW/admin/settings/post.json +++ b/public/language/zh-TW/admin/settings/post.json @@ -40,6 +40,7 @@ "teaser.last-post": "最後– 顯示最新的貼文，包括原帖，如果沒有回覆", "teaser.last-reply": "最後– 顯示最新回覆，如果沒有回覆，則顯示“無回覆”佔位符", "teaser.first": "第一", + "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", "unread": "未讀設定", "unread.cutoff": "未讀截止時間（天）", "unread.min-track-last": "跟蹤最後閱讀之前的主題最小貼文", From 5a0efd2d4222572aabb9760c5c87585067f06292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 1 Nov 2021 15:30:36 -0400 Subject: [PATCH 28/95] fix: don't use # for previews --- public/src/client/topic.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 6661b43d65..8127967292 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -201,10 +201,11 @@ define('forum/topic', [ } const href = link.attr('href'); + const validHref = href && href !== '#'; const pathname = utils.urlToLocation(href).pathname; $('#post-tooltip').remove(); - const postMatch = pathname && pathname.match(/\/post\/([\d]+)/); - const topicMatch = pathname && pathname.match(/\/topic\/([\d]+)/); + const postMatch = validHref && pathname && pathname.match(/\/post\/([\d]+)/); + const topicMatch = validHref && pathname && pathname.match(/\/topic\/([\d]+)/); if (postMatch) { const pid = postMatch[1]; if (parseInt(link.parents('[component="post"]').attr('data-pid'), 10) === parseInt(pid, 10)) { From 9fbb3b11efb0dfca1255058965c5526902b115cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 1 Nov 2021 18:22:39 -0400 Subject: [PATCH 29/95] perf: only load posts once --- public/src/client/topic.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 8127967292..4f32f70777 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -179,12 +179,14 @@ define('forum/topic', [ return; } let timeoutId = 0; + const postCache = {}; $('[component="topic"]').on('mouseenter', '[component="post"] a, [component="topic/event"] a', async function () { const link = $(this); async function renderPost(pid) { - const postData = await socket.emit('posts.getPostSummaryByPid', { pid: pid }); + const postData = postCache[pid] || await socket.emit('posts.getPostSummaryByPid', { pid: pid }); if (postData) { + postCache[pid] = postData; const tooltip = await app.parseAndTranslate('partials/topic/post-preview', { post: postData }); tooltip.hide().find('.timeago').timeago(); tooltip.appendTo($('body')).fadeIn(300); From b916e42f400dac8aa51670b15e439f87f0eb8939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 1 Nov 2021 19:36:18 -0400 Subject: [PATCH 30/95] feat: show number of events per type in acp --- src/controllers/admin/events.js | 6 ++++-- src/views/admin/advanced/events.tpl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/controllers/admin/events.js b/src/controllers/admin/events.js index 1ca791ac16..f077972aca 100644 --- a/src/controllers/admin/events.js +++ b/src/controllers/admin/events.js @@ -20,15 +20,17 @@ eventsController.get = async function (req, res) { const currentFilter = req.query.type || ''; - const [eventCount, eventData] = await Promise.all([ + const [eventCount, eventData, counts] = await Promise.all([ db.sortedSetCount(`events:time${currentFilter ? `:${currentFilter}` : ''}`, from || '-inf', to), events.getEvents(currentFilter, start, stop, from || '-inf', to), + db.sortedSetsCard([''].concat(events.types).map(type => `events:time${type ? `:${type}` : ''}`)), ]); - const types = [''].concat(events.types).map(type => ({ + const types = [''].concat(events.types).map((type, index) => ({ value: type, name: type || 'all', selected: type === currentFilter, + count: counts[index], })); const pageCount = Math.max(1, Math.ceil(eventCount / itemsPerPage)); diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index 0456b4bcdd..ccaca544b6 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -40,7 +40,7 @@ From 81c8d70c51e2b99acbd3789f082e23376fff9c13 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 2 Nov 2021 00:16:25 +0000 Subject: [PATCH 31/95] fix(deps): update dependency validator to v13.7.0 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index b825f4a98f..b8733ff5d0 100644 --- a/install/package.json +++ b/install/package.json @@ -132,7 +132,7 @@ "tinycon": "0.6.8", "toobusy-js": "^0.5.1", "uglify-es": "^3.3.9", - "validator": "13.6.0", + "validator": "13.7.0", "visibilityjs": "2.0.2", "winston": "3.3.3", "xml": "^1.0.1", From 1fce1056c567f81d93bca04c06aca8df98c5f332 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Tue, 2 Nov 2021 09:07:51 +0000 Subject: [PATCH 32/95] Latest translations and fallbacks --- public/language/bg/admin/settings/post.json | 2 +- public/language/he/admin/dashboard.json | 6 +++--- public/language/he/admin/menu.json | 2 +- public/language/he/admin/settings/email.json | 2 +- public/language/he/admin/settings/post.json | 2 +- public/language/he/error.json | 4 ++-- public/language/he/modules.json | 2 +- public/language/he/topic.json | 2 +- public/language/zh-CN/topic.json | 8 ++++---- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/public/language/bg/admin/settings/post.json b/public/language/bg/admin/settings/post.json index 6c80b214c2..3844182199 100644 --- a/public/language/bg/admin/settings/post.json +++ b/public/language/bg/admin/settings/post.json @@ -40,7 +40,7 @@ "teaser.last-post": "Последната – Показване на последната публикация, или първоначалната такава, ако няма отговори.", "teaser.last-reply": "Последната – Показване на последния отговор, или „Няма отговори“, ако все още няма такива.", "teaser.first": "Първата", - "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", + "showPostPreviewsOnHover": "Показване на кратък преглед на публикациите при посочване с мишката", "unread": "Настройки за непрочетените", "unread.cutoff": "Възраст на публикациите, след която те не се показват в непрочетените (в брой дни)", "unread.min-track-last": "Минимален брой публикации в темата, след което да започва следене на последно прочетената", diff --git a/public/language/he/admin/dashboard.json b/public/language/he/admin/dashboard.json index 0b9b6e20a6..2f6e8e6ba0 100644 --- a/public/language/he/admin/dashboard.json +++ b/public/language/he/admin/dashboard.json @@ -57,7 +57,7 @@ "active-users.connections": "חיבורים", "guest-registered-users": "Guest vs Registered Users", - "guest": "Guest", + "guest": "אורח", "registered": "רשומים", "user-presence": "נוכחות משתמשים", @@ -68,7 +68,7 @@ "unread": "לא נקראו", "high-presence-topics": "פוסטים עם הכי הרבה נוכחות", - "popular-searches": "Popular Searches", + "popular-searches": "חיפושים פופולריים", "graphs.page-views": "צפיות בדפים", "graphs.page-views-registered": "צפיות בדפים-רשומים", @@ -76,7 +76,7 @@ "graphs.page-views-bot": "צפיות בדפים-בוטים", "graphs.unique-visitors": "מבקרים ייחודיים", "graphs.registered-users": "משתמשים רשומים", - "graphs.guest-users": "Guest Users", + "graphs.guest-users": "משתמשים אורחים", "last-restarted-by": "אותחל לארונה על ידי", "no-users-browsing": "אין גולשים", diff --git a/public/language/he/admin/menu.json b/public/language/he/admin/menu.json index e18bb3012c..95890e7d15 100644 --- a/public/language/he/admin/menu.json +++ b/public/language/he/admin/menu.json @@ -4,7 +4,7 @@ "dashboard/logins": "כניסות", "dashboard/users": "משתמשים", "dashboard/topics": "נושאים", - "dashboard/searches": "Searches", + "dashboard/searches": "חיפושים", "section-general": "כללי", "section-manage": "ניהול", diff --git a/public/language/he/admin/settings/email.json b/public/language/he/admin/settings/email.json index 0c98d497e4..7c1fa4f51b 100644 --- a/public/language/he/admin/settings/email.json +++ b/public/language/he/admin/settings/email.json @@ -37,7 +37,7 @@ "subscriptions.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 ", "notifications.remove-images": "הסר תמונות מהודעות דוא\"ל", - "require-email-address": "Require new users to specify an email address", + "require-email-address": "דרוש ממשתמשים חדשים כתובת אימייל", "require-email-address-warning": "By default, users can opt-out of entering an email address. 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.", "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.", diff --git a/public/language/he/admin/settings/post.json b/public/language/he/admin/settings/post.json index a3c9ad12a9..e2c3681728 100644 --- a/public/language/he/admin/settings/post.json +++ b/public/language/he/admin/settings/post.json @@ -40,7 +40,7 @@ "teaser.last-post": "Last – הצג את הפוסט האחרון, כולל הפוסט המקורי, אם אין תגובות", "teaser.last-reply": "Last – הצג את התשובה האחרונה, או ציין \"ללא תשובות\" אם אין תשובות", "teaser.first": "ראשון", - "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", + "showPostPreviewsOnHover": "הצג תצוגה מקדימה בריחוף על פוסט", "unread": "הגדרות \"שלא נקראו\"", "unread.cutoff": "ימי ניתוק שלא נקראו", "unread.min-track-last": "פוסטים מינימליים בנושא לפני מעקב אחר קריאה אחרונה", diff --git a/public/language/he/error.json b/public/language/he/error.json index cdfa227e31..41575db79d 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -34,8 +34,8 @@ "email-invited": "כבר נשלחה הזמנה לדוא\"ל זה", "email-not-confirmed": "פרסום בקטגוריות או בנושאים מסוימים מופעל רק לאחר אישור הדוא\"ל שלך, אנא לחץ כאן כדי לשלוח אימות לדוא\"ל שלך.", "email-not-confirmed-chat": "אין באפשרותך לשוחח עד שהדוא\"ל שלך יאושר, אנא לחץ כאן כדי לאשר את הדוא\"ל שלך.", - "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You may not be able to post in some categories or chat until your email is confirmed.", - "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery, and may be necessary for chatting and posting in some categories. Please click here to enter an email.", + "email-not-confirmed-email-sent": "הדוא\"ל שלך עדין לא אושר. אנא בדוק בתיבת הדואר בנוגע לאישור הדוא\"ל שנשלח לך על ידינו. לא תוכל לכתוב פוסטים ולהשתמש בצ'אט לפני אימות הדוא\"ל שלך.", + "no-email-to-confirm": "בחשבונך לא הוגדר דוא\"ל. כתובת דוא\"ל נחוץ לשחזור חשבון. אנא לחץ כאן כדי להכניס דוא\"ל.", "user-doesnt-have-email": "למשתמש \"%1\" לא הוגדר כתובת דוא\"ל.", "email-confirm-failed": "לא הצלחנו לאשר את הדוא\"ל שלך, תנסה שוב אחר כך", "confirm-email-already-sent": "דוא\"ל האישור כבר נשלח, אנא המתן %1 דקות כדי לשלוח דוא\"ל נוסף.", diff --git a/public/language/he/modules.json b/public/language/he/modules.json index 5ad16e23df..ec27ff0fcd 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -54,7 +54,7 @@ "composer.formatting.strikethrough": "קו פוסל", "composer.formatting.code": "קוד", "composer.formatting.link": "לינק", - "composer.formatting.picture": "Image Link", + "composer.formatting.picture": "קישור תמונה", "composer.upload-picture": "העלה תמונה", "composer.upload-file": "העלה קובץ", "composer.zen_mode": "מסך מלא", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index fecfaa678a..5eb30f0cb8 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -139,7 +139,7 @@ "composer.handle_placeholder": "הזן את שמך / כינוי שלך כאן", "composer.discard": "ביטול", "composer.submit": "שלח", - "composer.additional-options": "Additional Options", + "composer.additional-options": "אפשרויות נוספות", "composer.schedule": "תזמן", "composer.replying_to": "מגיב ל%1", "composer.new_topic": "נושא חדש", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 970b7f8155..9d8a28c992 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -20,8 +20,8 @@ "login-to-view": "🔒登录查看", "edit": "编辑", "delete": "删除", - "delete-event": "Delete Event", - "delete-event-confirm": "Are you sure you want to delete this event?", + "delete-event": "删除元素", + "delete-event-confirm": "您确定要删除此元素吗？", "purge": "清除", "restore": "恢复", "move": "移动", @@ -39,8 +39,8 @@ "copy-ip": "复制IP", "ban-ip": "封禁IP", "view-history": "编辑历史", - "locked-by": "Locked by", - "unlocked-by": "Unlocked by", + "locked-by": "锁定自", + "unlocked-by": "解锁自", "pinned-by": "Pinned by", "unpinned-by": "Unpinned by", "deleted-by": "Deleted by", From dc78125aa67c759fe1c2ebe6225315c336dd1cb7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 1 Nov 2021 09:44:54 +0000 Subject: [PATCH 33/95] chore(deps): update commitlint monorepo to v14 --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index b8733ff5d0..200e346265 100644 --- a/install/package.json +++ b/install/package.json @@ -142,8 +142,8 @@ }, "devDependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@commitlint/cli": "13.2.1", - "@commitlint/config-angular": "13.2.0", + "@commitlint/cli": "14.1.0", + "@commitlint/config-angular": "14.1.0", "coveralls": "3.1.1", "eslint": "7.32.0", "eslint-config-nodebb": "0.0.3", From 8a88295d04aed5dbcac99dcaf4b4ca282f7b49ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 2 Nov 2021 20:05:17 -0400 Subject: [PATCH 34/95] fix: don't highlight external nav items --- public/src/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index bacbc2309d..1cf4471fb5 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -285,8 +285,8 @@ app.cacheBuster = null; .removeClass('active') .find('a') .filter(function (i, x) { - return window.location.pathname === x.pathname || - window.location.pathname.startsWith(x.pathname + '/'); + return window.location.hostname === x.hostname && (window.location.pathname === x.pathname || + window.location.pathname.startsWith(x.pathname + '/')); }) .parent() .addClass('active'); From 3e4d477e481f6e23edd52a9392ea43374e4de907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 3 Nov 2021 00:09:30 -0400 Subject: [PATCH 35/95] chore: up mentions --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 200e346265..05c0309d22 100644 --- a/install/package.json +++ b/install/package.json @@ -89,7 +89,7 @@ "nodebb-plugin-emoji": "^3.5.0", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "8.14.4", - "nodebb-plugin-mentions": "2.14.1", + "nodebb-plugin-mentions": "2.15.0", "nodebb-plugin-spam-be-gone": "0.7.10", "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.2.1", From ddeeee7f1ad2a0232d2c5296d417457bae4aa0ff Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 3 Nov 2021 09:07:30 +0000 Subject: [PATCH 36/95] Latest translations and fallbacks --- public/language/de/admin/advanced/events.json | 2 +- public/language/de/admin/advanced/logs.json | 8 ++++---- public/language/de/admin/manage/digest.json | 4 ++-- public/language/it/admin/settings/post.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/language/de/admin/advanced/events.json b/public/language/de/admin/advanced/events.json index 8b2cc6bf9a..9f87f04efa 100644 --- a/public/language/de/admin/advanced/events.json +++ b/public/language/de/admin/advanced/events.json @@ -3,7 +3,7 @@ "no-events": "Es gibt keine Ereignisse", "control-panel": "Ereignis-Steuerung", "delete-events": "Ereignisse löschen", - "confirm-delete-all-events": "Are you sure you want to delete all logged events?", + "confirm-delete-all-events": "Bist du sicher, dass du alle gespeicherten Events löschen möchtest?", "filters": "Filter", "filters-apply": "Filter anwenden", "filter-type": "Ereignistyp", diff --git a/public/language/de/admin/advanced/logs.json b/public/language/de/admin/advanced/logs.json index 7399c68b46..e0bce077ae 100644 --- a/public/language/de/admin/advanced/logs.json +++ b/public/language/de/admin/advanced/logs.json @@ -1,7 +1,7 @@ { - "logs": "Protokoll", + "logs": "Protokolle", "control-panel": "Protokoll Steuerung", - "reload": "Protokoll neu laden", - "clear": "Protokoll leeren", - "clear-success": "Protokoll geleert" + "reload": "Protokolle neu laden", + "clear": "Protokolle löschen", + "clear-success": "Protokolle gelöscht" } \ No newline at end of file diff --git a/public/language/de/admin/manage/digest.json b/public/language/de/admin/manage/digest.json index 07e7a5e321..2f1212d11f 100644 --- a/public/language/de/admin/manage/digest.json +++ b/public/language/de/admin/manage/digest.json @@ -5,8 +5,8 @@ "user": "Benutzer", "subscription": "Subscription Type", - "last-delivery": "Last successful delivery", - "default": "System default", + "last-delivery": "Letzte erfolgreiche Zustellung", + "default": "System Standard", "default-help": "System default means the user has not explicitly overridden the global forum setting for digests, which is currently: "%1"", "resend": "Resend Digest", "resend-all-confirm": "Are you sure you wish to manually execute this digest run?", diff --git a/public/language/it/admin/settings/post.json b/public/language/it/admin/settings/post.json index 0513f2fdfe..74c8a44199 100644 --- a/public/language/it/admin/settings/post.json +++ b/public/language/it/admin/settings/post.json @@ -40,7 +40,7 @@ "teaser.last-post": "Ultimo – Mostra l'ultimo post, incluso il post originale, se non ci sono risposte", "teaser.last-reply": "Ultimo – Mostra l'ultima risposta o un segnaposto \"Nessuna risposta\" se non risposto", "teaser.first": "Primo", - "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", + "showPostPreviewsOnHover": "Mostra un'anteprima dei post quando il mouse ci passa sopra", "unread": "Impostazioni non Lette", "unread.cutoff": "Giorni di interruzione non letti", "unread.min-track-last": "Post minimi nell'argomento prima del monitoraggio dell'ultima lettura", From 0f8a68c0457388bdeced648bf653360e457412e7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 3 Nov 2021 09:13:20 +0000 Subject: [PATCH 37/95] fix(deps): update dependency nodebb-plugin-mentions to v2.15.1 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 05c0309d22..43f5486f7b 100644 --- a/install/package.json +++ b/install/package.json @@ -89,7 +89,7 @@ "nodebb-plugin-emoji": "^3.5.0", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "8.14.4", - "nodebb-plugin-mentions": "2.15.0", + "nodebb-plugin-mentions": "2.15.1", "nodebb-plugin-spam-be-gone": "0.7.10", "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.2.1", From f728abda06b02ef3e27e16844b22fa4a364e23ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 3 Nov 2021 10:52:03 -0400 Subject: [PATCH 38/95] fix: remove tooltip on ajaxify --- public/src/client/topic.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 4f32f70777..478883b62e 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -180,6 +180,10 @@ define('forum/topic', [ } let timeoutId = 0; const postCache = {}; + $(window).one('action:ajaxify.start', function () { + clearTimeout(timeoutId); + $('#post-tooltip').remove(); + }); $('[component="topic"]').on('mouseenter', '[component="post"] a, [component="topic/event"] a', async function () { const link = $(this); From 98b98a113094fde28a07f6f00569dfcc97ae264c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 3 Nov 2021 12:25:58 -0400 Subject: [PATCH 39/95] chore: up mentions --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 43f5486f7b..7f66b2a0a6 100644 --- a/install/package.json +++ b/install/package.json @@ -89,7 +89,7 @@ "nodebb-plugin-emoji": "^3.5.0", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "8.14.4", - "nodebb-plugin-mentions": "2.15.1", + "nodebb-plugin-mentions": "2.15.2", "nodebb-plugin-spam-be-gone": "0.7.10", "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.2.1", From 2e623dd2713aa71daf8d94ac972e0384c9a2e02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 3 Nov 2021 16:01:32 -0400 Subject: [PATCH 40/95] feat: #9967, allow dropdowns in navigation --- .../language/en-GB/admin/settings/navigation.json | 4 +++- public/src/app.js | 9 ++++++--- src/controllers/admin/settings.js | 3 +++ src/views/admin/settings/navigation.tpl | 13 +++++++++++++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/public/language/en-GB/admin/settings/navigation.json b/public/language/en-GB/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/en-GB/admin/settings/navigation.json +++ b/public/language/en-GB/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/src/app.js b/public/src/app.js index 1cf4471fb5..e6f3e95e1c 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -284,9 +284,12 @@ app.cacheBuster = null; $('#main-nav li') .removeClass('active') .find('a') - .filter(function (i, x) { - return window.location.hostname === x.hostname && (window.location.pathname === x.pathname || - window.location.pathname.startsWith(x.pathname + '/')); + .filter(function (i, a) { + return $(a).attr('href') !== '#' && window.location.hostname === a.hostname && + ( + window.location.pathname === a.pathname || + window.location.pathname.startsWith(a.pathname + '/') + ); }) .parent() .addClass('active'); diff --git a/src/controllers/admin/settings.js b/src/controllers/admin/settings.js index 41166e6d1c..d4abecd479 100644 --- a/src/controllers/admin/settings.js +++ b/src/controllers/admin/settings.js @@ -1,5 +1,7 @@ 'use strict'; +const validator = require('validator'); + const meta = require('../../meta'); const emailer = require('../../emailer'); const notifications = require('../../notifications'); @@ -72,6 +74,7 @@ settingsController.navigation = async function (req, res) { enabled.selected = index === 0; enabled.title = translator.escape(enabled.title); enabled.text = translator.escape(enabled.text); + enabled.dropdownContent = translator.escape(validator.escape(String(enabled.dropdownContent || ''))); enabled.groups = admin.groups.map(group => ({ displayName: group.displayName, selected: enabled.groups.includes(group.name), diff --git a/src/views/admin/settings/navigation.tpl b/src/views/admin/settings/navigation.tpl index 86cff2d1e1..cd406b90ab 100644 --- a/src/views/admin/settings/navigation.tpl +++ b/src/views/admin/settings/navigation.tpl @@ -89,6 +89,19 @@ +
+ +
+
+

+ [[admin/settings/navigation:dropdown-placeholder]] +

+ +
+ From 3727e39f874cf73351224b9430c7a874eed89339 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 3 Nov 2021 20:02:19 +0000 Subject: [PATCH 41/95] chore(i18n): fallback strings for new resources: nodebb.admin-settings-navigation --- public/language/ar/admin/settings/navigation.json | 4 +++- public/language/bg/admin/settings/navigation.json | 4 +++- public/language/bn/admin/settings/navigation.json | 4 +++- public/language/cs/admin/settings/navigation.json | 4 +++- public/language/da/admin/settings/navigation.json | 4 +++- public/language/de/admin/settings/navigation.json | 4 +++- public/language/el/admin/settings/navigation.json | 4 +++- public/language/en-US/admin/settings/navigation.json | 4 +++- public/language/en-x-pirate/admin/settings/navigation.json | 4 +++- public/language/es/admin/settings/navigation.json | 4 +++- public/language/et/admin/settings/navigation.json | 4 +++- public/language/fa-IR/admin/settings/navigation.json | 4 +++- public/language/fi/admin/settings/navigation.json | 4 +++- public/language/fr/admin/settings/navigation.json | 4 +++- public/language/gl/admin/settings/navigation.json | 4 +++- public/language/he/admin/settings/navigation.json | 4 +++- public/language/hr/admin/settings/navigation.json | 4 +++- public/language/hu/admin/settings/navigation.json | 4 +++- public/language/id/admin/settings/navigation.json | 4 +++- public/language/it/admin/settings/navigation.json | 4 +++- public/language/ja/admin/settings/navigation.json | 4 +++- public/language/ko/admin/settings/navigation.json | 4 +++- public/language/lt/admin/settings/navigation.json | 4 +++- public/language/lv/admin/settings/navigation.json | 4 +++- public/language/ms/admin/settings/navigation.json | 4 +++- public/language/nb/admin/settings/navigation.json | 4 +++- public/language/nl/admin/settings/navigation.json | 4 +++- public/language/pl/admin/settings/navigation.json | 4 +++- public/language/pt-BR/admin/settings/navigation.json | 4 +++- public/language/pt-PT/admin/settings/navigation.json | 4 +++- public/language/ro/admin/settings/navigation.json | 4 +++- public/language/ru/admin/settings/navigation.json | 4 +++- public/language/rw/admin/settings/navigation.json | 4 +++- public/language/sc/admin/settings/navigation.json | 4 +++- public/language/sk/admin/settings/navigation.json | 4 +++- public/language/sl/admin/settings/navigation.json | 4 +++- public/language/sr/admin/settings/navigation.json | 4 +++- public/language/sv/admin/settings/navigation.json | 4 +++- public/language/th/admin/settings/navigation.json | 4 +++- public/language/tr/admin/settings/navigation.json | 4 +++- public/language/uk/admin/settings/navigation.json | 4 +++- public/language/vi/admin/settings/navigation.json | 4 +++- public/language/zh-CN/admin/settings/navigation.json | 4 +++- public/language/zh-TW/admin/settings/navigation.json | 4 +++- 44 files changed, 132 insertions(+), 44 deletions(-) diff --git a/public/language/ar/admin/settings/navigation.json b/public/language/ar/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/ar/admin/settings/navigation.json +++ b/public/language/ar/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/bg/admin/settings/navigation.json b/public/language/bg/admin/settings/navigation.json index eee7a0e588..5e53ebbcfd 100644 --- a/public/language/bg/admin/settings/navigation.json +++ b/public/language/bg/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Свойства:", "groups": "Групи:", "open-new-window": "Отваряне в нов прозорец", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Изтриване", "btn.disable": "Изключване", @@ -20,4 +22,4 @@ "custom-route": "Персонализиран маршрут", "core": "ядро", "plugin": "добавка" -} \ No newline at end of file +} diff --git a/public/language/bn/admin/settings/navigation.json b/public/language/bn/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/bn/admin/settings/navigation.json +++ b/public/language/bn/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/cs/admin/settings/navigation.json b/public/language/cs/admin/settings/navigation.json index a434257b94..5811c99768 100644 --- a/public/language/cs/admin/settings/navigation.json +++ b/public/language/cs/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Vlastnosti:", "groups": "Skupiny:", "open-new-window": "Otevřít v novém okně", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Odstranit", "btn.disable": "Zakázat", @@ -20,4 +22,4 @@ "custom-route": "Upravit cestu", "core": "jádro", "plugin": "rozšíření" -} \ No newline at end of file +} diff --git a/public/language/da/admin/settings/navigation.json b/public/language/da/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/da/admin/settings/navigation.json +++ b/public/language/da/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/de/admin/settings/navigation.json b/public/language/de/admin/settings/navigation.json index 1bedf15f20..a3809cafeb 100644 --- a/public/language/de/admin/settings/navigation.json +++ b/public/language/de/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Eigenschaften:", "groups": "Gruppen:", "open-new-window": "In neuem Fenster öffnen", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Löschen", "btn.disable": "Deaktivieren", @@ -20,4 +22,4 @@ "custom-route": "Benutzerdefinierter Pfad", "core": "Kern", "plugin": "Plugin" -} \ No newline at end of file +} diff --git a/public/language/el/admin/settings/navigation.json b/public/language/el/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/el/admin/settings/navigation.json +++ b/public/language/el/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/en-US/admin/settings/navigation.json b/public/language/en-US/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/en-US/admin/settings/navigation.json +++ b/public/language/en-US/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/en-x-pirate/admin/settings/navigation.json b/public/language/en-x-pirate/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/en-x-pirate/admin/settings/navigation.json +++ b/public/language/en-x-pirate/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/es/admin/settings/navigation.json b/public/language/es/admin/settings/navigation.json index 22cad76ef8..3b28dd115a 100644 --- a/public/language/es/admin/settings/navigation.json +++ b/public/language/es/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Propiedades:", "groups": "Grupos:", "open-new-window": "Abrir en una ventana nueva", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Borrar", "btn.disable": "Deshabilitar", @@ -20,4 +22,4 @@ "custom-route": "Ruta Personalizada:", "core": "núcleo", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/et/admin/settings/navigation.json b/public/language/et/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/et/admin/settings/navigation.json +++ b/public/language/et/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/fa-IR/admin/settings/navigation.json b/public/language/fa-IR/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/fa-IR/admin/settings/navigation.json +++ b/public/language/fa-IR/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/fi/admin/settings/navigation.json b/public/language/fi/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/fi/admin/settings/navigation.json +++ b/public/language/fi/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/fr/admin/settings/navigation.json b/public/language/fr/admin/settings/navigation.json index 02d6a7fbeb..857177d2b2 100644 --- a/public/language/fr/admin/settings/navigation.json +++ b/public/language/fr/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Propriétés :", "groups": "Groupes:", "open-new-window": "Ouvrir dans une nouvelle fenêtre", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Supprimer", "btn.disable": "Désactiver", @@ -20,4 +22,4 @@ "custom-route": "Route personnalisée", "core": "cœur", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/gl/admin/settings/navigation.json b/public/language/gl/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/gl/admin/settings/navigation.json +++ b/public/language/gl/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/he/admin/settings/navigation.json b/public/language/he/admin/settings/navigation.json index b89a64c2ac..fd4d8d9509 100644 --- a/public/language/he/admin/settings/navigation.json +++ b/public/language/he/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "הרשאות:", "groups": "קבוצות:", "open-new-window": "פתח בחלון חדש", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "מחק", "btn.disable": "השבת", @@ -20,4 +22,4 @@ "custom-route": "נתיב מותאם אישית", "core": "ליבה", "plugin": "תוסף" -} \ No newline at end of file +} diff --git a/public/language/hr/admin/settings/navigation.json b/public/language/hr/admin/settings/navigation.json index 4921e75e6c..00f84662dd 100644 --- a/public/language/hr/admin/settings/navigation.json +++ b/public/language/hr/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Postavke", "groups": "Groups:", "open-new-window": "Otvori u novom prozoru", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Obriši", "btn.disable": "Onemogući", @@ -20,4 +22,4 @@ "custom-route": "Uobičajna putanja", "core": "jezgra", "plugin": "dodatak" -} \ No newline at end of file +} diff --git a/public/language/hu/admin/settings/navigation.json b/public/language/hu/admin/settings/navigation.json index 5c75530a87..704bea5c2a 100644 --- a/public/language/hu/admin/settings/navigation.json +++ b/public/language/hu/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Tulajdonságok:", "groups": "Csoportok:", "open-new-window": "Megnyitás új ablakban", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Törlés", "btn.disable": "Tiltás", @@ -20,4 +22,4 @@ "custom-route": "Egyéni útvonal", "core": "alapvető", "plugin": "beépülő" -} \ No newline at end of file +} diff --git a/public/language/id/admin/settings/navigation.json b/public/language/id/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/id/admin/settings/navigation.json +++ b/public/language/id/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/it/admin/settings/navigation.json b/public/language/it/admin/settings/navigation.json index 04cd16e1a6..77ba9c2f42 100644 --- a/public/language/it/admin/settings/navigation.json +++ b/public/language/it/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Proprietà:", "groups": "Gruppi:", "open-new-window": "Apri in una nuova finestra", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Elimina", "btn.disable": "Disabilita", @@ -20,4 +22,4 @@ "custom-route": "Percorso personalizzato", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/ja/admin/settings/navigation.json b/public/language/ja/admin/settings/navigation.json index f263418193..f3d7c35e87 100644 --- a/public/language/ja/admin/settings/navigation.json +++ b/public/language/ja/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "プロパティ:", "groups": "Groups:", "open-new-window": "新しいウィンドウで開く", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "削除", "btn.disable": "無効", @@ -20,4 +22,4 @@ "custom-route": "カスタムルート", "core": "コア", "plugin": "プラグイン" -} \ No newline at end of file +} diff --git a/public/language/ko/admin/settings/navigation.json b/public/language/ko/admin/settings/navigation.json index c3c613d0f5..6c6f584c78 100644 --- a/public/language/ko/admin/settings/navigation.json +++ b/public/language/ko/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "속성:", "groups": "그룹:", "open-new-window": "새 창에서 열기", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "삭제", "btn.disable": "비활성화", @@ -20,4 +22,4 @@ "custom-route": "사용자 정의 경로", "core": "코어", "plugin": "플러그인" -} \ No newline at end of file +} diff --git a/public/language/lt/admin/settings/navigation.json b/public/language/lt/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/lt/admin/settings/navigation.json +++ b/public/language/lt/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/lv/admin/settings/navigation.json b/public/language/lv/admin/settings/navigation.json index c6908195e0..b4327584a4 100644 --- a/public/language/lv/admin/settings/navigation.json +++ b/public/language/lv/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Īpašības:", "groups": "Grupas:", "open-new-window": "Rādīt jaunā logā", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Izdzēst", "btn.disable": "Atspējot", @@ -20,4 +22,4 @@ "custom-route": "Pielāgotais ceļš", "core": "kodols", "plugin": "spraudnis" -} \ No newline at end of file +} diff --git a/public/language/ms/admin/settings/navigation.json b/public/language/ms/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/ms/admin/settings/navigation.json +++ b/public/language/ms/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/nb/admin/settings/navigation.json b/public/language/nb/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/nb/admin/settings/navigation.json +++ b/public/language/nb/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/nl/admin/settings/navigation.json b/public/language/nl/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/nl/admin/settings/navigation.json +++ b/public/language/nl/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/pl/admin/settings/navigation.json b/public/language/pl/admin/settings/navigation.json index 42a9e7c98c..36c88f8ca5 100644 --- a/public/language/pl/admin/settings/navigation.json +++ b/public/language/pl/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Ustawienia:", "groups": "Grupy:", "open-new-window": "Otwórz w nowym oknie", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Usuń", "btn.disable": "Wyłącz", @@ -20,4 +22,4 @@ "custom-route": "Niestandardowa ścieżka", "core": "system", "plugin": "wtyczka" -} \ No newline at end of file +} diff --git a/public/language/pt-BR/admin/settings/navigation.json b/public/language/pt-BR/admin/settings/navigation.json index 84704c797e..87f2bea84e 100644 --- a/public/language/pt-BR/admin/settings/navigation.json +++ b/public/language/pt-BR/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Propriedades:", "groups": "Grupos:", "open-new-window": "Abrir em uma nova janela", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Deletar", "btn.disable": "Desativar", @@ -20,4 +22,4 @@ "custom-route": "Rota Personalizada", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/pt-PT/admin/settings/navigation.json b/public/language/pt-PT/admin/settings/navigation.json index 8e5ff802f9..ca1e541e23 100644 --- a/public/language/pt-PT/admin/settings/navigation.json +++ b/public/language/pt-PT/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Propriedades:", "groups": "Grupos:", "open-new-window": "Abrir numa nova janela", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Apagar", "btn.disable": "Desativar", @@ -20,4 +22,4 @@ "custom-route": "Caminho Personalizado", "core": "sistema", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/ro/admin/settings/navigation.json b/public/language/ro/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/ro/admin/settings/navigation.json +++ b/public/language/ro/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/ru/admin/settings/navigation.json b/public/language/ru/admin/settings/navigation.json index 4bcef87827..d5ad4c9534 100644 --- a/public/language/ru/admin/settings/navigation.json +++ b/public/language/ru/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Свойства:", "groups": "Группы:", "open-new-window": "Открывать в новом окне", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Удалить", "btn.disable": "Выключить", @@ -20,4 +22,4 @@ "custom-route": "Произвольный маршрут", "core": "ядро", "plugin": "плагин" -} \ No newline at end of file +} diff --git a/public/language/rw/admin/settings/navigation.json b/public/language/rw/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/rw/admin/settings/navigation.json +++ b/public/language/rw/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/sc/admin/settings/navigation.json b/public/language/sc/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/sc/admin/settings/navigation.json +++ b/public/language/sc/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/sk/admin/settings/navigation.json b/public/language/sk/admin/settings/navigation.json index 24125b086b..59aef4df0b 100644 --- a/public/language/sk/admin/settings/navigation.json +++ b/public/language/sk/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Vlastnosti:", "groups": "Groups:", "open-new-window": "Otvoriť v novom okne", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Odstrániť", "btn.disable": "Zakázať", @@ -20,4 +22,4 @@ "custom-route": "Upraviť cestu", "core": "jadro", "plugin": "zásuvný modul" -} \ No newline at end of file +} diff --git a/public/language/sl/admin/settings/navigation.json b/public/language/sl/admin/settings/navigation.json index fc2c5f2946..fdfe4fce31 100644 --- a/public/language/sl/admin/settings/navigation.json +++ b/public/language/sl/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Lastnosti:", "groups": "Skupine", "open-new-window": "Odpri v novem oknu", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Izbriši", "btn.disable": "Onemogoči", @@ -20,4 +22,4 @@ "custom-route": "Pot po meri", "core": "jedro", "plugin": "vtičnik" -} \ No newline at end of file +} diff --git a/public/language/sr/admin/settings/navigation.json b/public/language/sr/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/sr/admin/settings/navigation.json +++ b/public/language/sr/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/sv/admin/settings/navigation.json b/public/language/sv/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/sv/admin/settings/navigation.json +++ b/public/language/sv/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/th/admin/settings/navigation.json b/public/language/th/admin/settings/navigation.json index 13dd01aae7..7baca85096 100644 --- a/public/language/th/admin/settings/navigation.json +++ b/public/language/th/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Properties:", "groups": "Groups:", "open-new-window": "Open in a new window", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Delete", "btn.disable": "Disable", @@ -20,4 +22,4 @@ "custom-route": "Custom Route", "core": "core", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/tr/admin/settings/navigation.json b/public/language/tr/admin/settings/navigation.json index d961c240de..ea0e2794e3 100644 --- a/public/language/tr/admin/settings/navigation.json +++ b/public/language/tr/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Özellikler:", "groups": "Gruplar", "open-new-window": "Yeni pencerede aç", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Sil", "btn.disable": "Etkinsizleştir", @@ -20,4 +22,4 @@ "custom-route": "Özel Yol", "core": "çekirdek", "plugin": "eklenti" -} \ No newline at end of file +} diff --git a/public/language/uk/admin/settings/navigation.json b/public/language/uk/admin/settings/navigation.json index 7e80dd4304..8d6f6fad19 100644 --- a/public/language/uk/admin/settings/navigation.json +++ b/public/language/uk/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Властивості:", "groups": "Groups:", "open-new-window": "Відкривати у новому вікні", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Видалити", "btn.disable": "Вимкнути", @@ -20,4 +22,4 @@ "custom-route": "Користувацький шлях", "core": "ядро", "plugin": "плагін" -} \ No newline at end of file +} diff --git a/public/language/vi/admin/settings/navigation.json b/public/language/vi/admin/settings/navigation.json index 8f47a0d402..9f41b189e4 100644 --- a/public/language/vi/admin/settings/navigation.json +++ b/public/language/vi/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "Thuộc tính:", "groups": "Nhóm:", "open-new-window": "Mở trong một cửa sổ mới", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Xóa", "btn.disable": "Tắt", @@ -20,4 +22,4 @@ "custom-route": "Tùy Chỉnh Liên Kết", "core": "lõi", "plugin": "plugin" -} \ No newline at end of file +} diff --git a/public/language/zh-CN/admin/settings/navigation.json b/public/language/zh-CN/admin/settings/navigation.json index f7f9003ed1..968f8362ba 100644 --- a/public/language/zh-CN/admin/settings/navigation.json +++ b/public/language/zh-CN/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "属性：", "groups": "群组：", "open-new-window": "在新窗口中打开", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "删除", "btn.disable": "禁用", @@ -20,4 +22,4 @@ "custom-route": "自定义路由", "core": "核心", "plugin": "插件" -} \ No newline at end of file +} diff --git a/public/language/zh-TW/admin/settings/navigation.json b/public/language/zh-TW/admin/settings/navigation.json index 15ac71b9a0..de20547ab9 100644 --- a/public/language/zh-TW/admin/settings/navigation.json +++ b/public/language/zh-TW/admin/settings/navigation.json @@ -11,6 +11,8 @@ "properties": "屬性：", "groups": "群組：", "open-new-window": "在新窗口中打開", + "dropdown": "Dropdown", + "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "刪除", "btn.disable": "禁用", @@ -20,4 +22,4 @@ "custom-route": "自訂路徑", "core": "核心", "plugin": "外掛" -} \ No newline at end of file +} From 8fac8d6188fbb06e24c8bb22f1bb2593d04c6181 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 19:02:13 -0400 Subject: [PATCH 42/95] fix(deps): update dependency nodebb-theme-persona to v11.2.21 (#9969) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 7f66b2a0a6..99693772c8 100644 --- a/install/package.json +++ b/install/package.json @@ -93,7 +93,7 @@ "nodebb-plugin-spam-be-gone": "0.7.10", "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.2.1", - "nodebb-theme-persona": "11.2.20", + "nodebb-theme-persona": "11.2.21", "nodebb-theme-slick": "1.4.14", "nodebb-theme-vanilla": "12.1.8", "nodebb-widget-essentials": "5.0.4", From f59937314b85b42f60f5abd6fef42fe53964b125 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 19:02:29 -0400 Subject: [PATCH 43/95] fix(deps): update dependency mongodb to v4.1.4 (#9968) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 99693772c8..8d4c3f206c 100644 --- a/install/package.json +++ b/install/package.json @@ -78,7 +78,7 @@ "material-design-lite": "^1.3.0", "mime": "^2.5.2", "mkdirp": "^1.0.4", - "mongodb": "4.1.3", + "mongodb": "4.1.4", "morgan": "^1.10.0", "mousetrap": "^1.6.5", "multiparty": "4.2.2", From 0888aae6d2b3f89dc25c379e7fb5a28e542391b9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 19:02:38 -0400 Subject: [PATCH 44/95] fix(deps): update dependency nodebb-plugin-mentions to v3 (#9966) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 8d4c3f206c..97be036d6e 100644 --- a/install/package.json +++ b/install/package.json @@ -89,7 +89,7 @@ "nodebb-plugin-emoji": "^3.5.0", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "8.14.4", - "nodebb-plugin-mentions": "2.15.2", + "nodebb-plugin-mentions": "3.0.0", "nodebb-plugin-spam-be-gone": "0.7.10", "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.2.1", From b1d6c9ba2998b01401c36c2f4c6f614901877cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 3 Nov 2021 19:05:02 -0400 Subject: [PATCH 45/95] chore: up themes --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 97be036d6e..fa2455cf70 100644 --- a/install/package.json +++ b/install/package.json @@ -94,8 +94,8 @@ "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.2.1", "nodebb-theme-persona": "11.2.21", - "nodebb-theme-slick": "1.4.14", - "nodebb-theme-vanilla": "12.1.8", + "nodebb-theme-slick": "1.4.15", + "nodebb-theme-vanilla": "12.1.9", "nodebb-widget-essentials": "5.0.4", "nodemailer": "^6.5.0", "nprogress": "0.2.0", From 67cb24912253d1a8000ffcdad5673a1d258d68a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 3 Nov 2021 22:47:15 -0400 Subject: [PATCH 46/95] fix: #9972 --- src/posts/uploads.js | 3 ++- test/topics/thumbs.js | 28 +++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/posts/uploads.js b/src/posts/uploads.js index 9cc827d6a5..cfab10671b 100644 --- a/src/posts/uploads.js +++ b/src/posts/uploads.js @@ -41,7 +41,8 @@ module.exports = function (Posts) { if (isMainPost) { const tid = await Posts.getPostField(pid, 'tid'); let thumbs = await topics.thumbs.get(tid); - thumbs = thumbs.map(thumb => thumb.url.replace(path.join(nconf.get('relative_path'), nconf.get('upload_url'), 'files/'), '')).filter(path => !validator.isURL(path, { + const replacePath = path.posix.join(nconf.get('relative_path'), nconf.get('upload_url'), 'files/'); + thumbs = thumbs.map(thumb => thumb.url.replace(replacePath, '')).filter(path => !validator.isURL(path, { require_protocol: true, })); uploads.push(...thumbs); diff --git a/test/topics/thumbs.js b/test/topics/thumbs.js index 417d4c55d8..2cdd1d66a9 100644 --- a/test/topics/thumbs.js +++ b/test/topics/thumbs.js @@ -92,7 +92,7 @@ describe('Topic thumbs', () => { require('../../src/cache').del(`topic:${topicObj.topicData.tid}:thumbs`); const thumbs = await topics.thumbs.get(topicObj.topicData.tid); assert.deepStrictEqual(thumbs, [{ - id: 2, + id: topicObj.topicData.tid, name: 'test.png', url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[0]}`, }]); @@ -102,7 +102,7 @@ describe('Topic thumbs', () => { const thumbs = await topics.thumbs.get([topicObj.topicData.tid, topicObj.topicData.tid + 1]); assert.deepStrictEqual(thumbs, [ [{ - id: 2, + id: topicObj.topicData.tid, name: 'test.png', url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[0]}`, }], @@ -132,7 +132,7 @@ describe('Topic thumbs', () => { path: relativeThumbPaths[0], }); - const exists = await db.isSortedSetMember(`topic:3:thumbs`, relativeThumbPaths[0]); + const exists = await db.isSortedSetMember(`topic:${tid}:thumbs`, relativeThumbPaths[0]); assert(exists); }); @@ -153,17 +153,17 @@ describe('Topic thumbs', () => { path: relativeThumbPaths[2], }); - const exists = await db.isSortedSetMember(`topic:3:thumbs`, relativeThumbPaths[2]); + const exists = await db.isSortedSetMember(`topic:${tid}:thumbs`, relativeThumbPaths[2]); assert(exists); }); it('should have a score equal to the number of thumbs prior to addition', async () => { - const scores = await db.sortedSetScores('topic:3:thumbs', [relativeThumbPaths[0], relativeThumbPaths[2]]); + const scores = await db.sortedSetScores(`topic:${tid}:thumbs`, [relativeThumbPaths[0], relativeThumbPaths[2]]); assert.deepStrictEqual(scores, [0, 1]); }); it('should update the relevant topic hash with the number of thumbnails', async () => { - const numThumbs = await topics.getTopicField(3, 'numThumbs'); + const numThumbs = await topics.getTopicField(tid, 'numThumbs'); assert.strictEqual(parseInt(numThumbs, 10), 2); }); @@ -173,7 +173,7 @@ describe('Topic thumbs', () => { path: relativeThumbPaths[0], }); - const score = await db.sortedSetScore(`topic:3:thumbs`, relativeThumbPaths[0]); + const score = await db.sortedSetScore(`topic:${tid}:thumbs`, relativeThumbPaths[0]); assert(isFinite(score)); // exists in set assert.strictEqual(score, 2); @@ -186,7 +186,7 @@ describe('Topic thumbs', () => { score: 0, }); - const score = await db.sortedSetScore(`topic:3:thumbs`, relativeThumbPaths[0]); + const score = await db.sortedSetScore(`topic:${tid}:thumbs`, relativeThumbPaths[0]); assert(isFinite(score)); // exists in set assert.strictEqual(score, 0); @@ -202,27 +202,25 @@ describe('Topic thumbs', () => { const uploads = await posts.uploads.list(mainPid); assert(uploads.includes(path.basename(relativeThumbPaths[0]))); }); - }); - describe('.migrate()', () => { it('should combine the thumbs uploaded to a UUID zset and combine it with a topic\'s thumb zset', async () => { - await topics.thumbs.migrate(uuid, 3); + await topics.thumbs.migrate(uuid, tid); - const thumbs = await topics.thumbs.get(3); + const thumbs = await topics.thumbs.get(tid); assert.strictEqual(thumbs.length, 3); assert.deepStrictEqual(thumbs, [ { - id: 3, + id: tid, name: 'test.png', url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[0]}`, }, { - id: 3, + id: tid, name: 'example.org', url: 'https://example.org', }, { - id: 3, + id: tid, name: 'test2.png', url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[1]}`, }, From d27c9696e3d90b823172a6c492b40d1c6bba581e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 4 Nov 2021 00:09:14 -0400 Subject: [PATCH 47/95] feat: add node 16 (#9847) * feat: add node 16 * fix: check errors in fork * test: add use-spawn * test: another test * Revert "test: another test" This reverts commit 606efe26fe1decd5d9269d63d5b649441ba2203b. * test: another test * fix: lint * fix: remove spawn-wrap * test: comment out plugin installs * fix: lint * test: uncomment all tests except npm i * fix: lint * test: bring back tests * test: remove leftover override --- .github/workflows/test.yaml | 2 +- src/password.js | 4 ++++ test/package-install.js | 6 ++++-- test/plugins.js | 23 ++++++++++++++++++----- test/socket.io.js | 35 +++++++++++++++++++++++++++++++---- 5 files changed, 58 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 90683cf490..e8b07af4cd 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - node: [12, 14] + node: [12, 14, 16] database: [mongo-dev, mongo, redis, postgres] include: # only run coverage once diff --git a/src/password.js b/src/password.js index 727528a3a8..d1b6fc2df5 100644 --- a/src/password.js +++ b/src/password.js @@ -14,6 +14,10 @@ function forkChild(message, callback) { child.on('message', (msg) => { callback(msg.err ? new Error(msg.err) : null, msg.result); }); + child.on('error', (err) => { + console.error(err.stack); + callback(err); + }); child.send(message); } diff --git a/test/package-install.js b/test/package-install.js index 3305c2e532..34d256c9f4 100644 --- a/test/package-install.js +++ b/test/package-install.js @@ -1,6 +1,5 @@ 'use strict'; - const { execSync } = require('child_process'); const path = require('path'); const { readFileSync } = require('fs'); @@ -9,12 +8,14 @@ const assert = require('assert'); describe('Package install', () => { it('should remove non-`nodebb-` modules not specified in `install/package.json`', () => { + const oldValue = process.env.NODE_ENV; + process.env.NODE_ENV = 'development'; const packageFilePath = path.join(__dirname, '../package.json'); // install an extra package // chose dotenv because it's a popular package // and we use nconf instead - execSync('npm install dotenv --save --production'); + execSync('npm install dotenv --save'); // assert it saves in package.json const packageWithExtras = JSON.parse(readFileSync(packageFilePath, 'utf8')); @@ -26,5 +27,6 @@ describe('Package install', () => { // assert it removed the extra package const packageCleaned = JSON.parse(readFileSync(packageFilePath, 'utf8')); assert(!packageCleaned.dependencies.dotenv, 'dependency was not removed'); + process.env.NODE_ENV = oldValue; }); }); diff --git a/test/plugins.js b/test/plugins.js index ae5e403abf..04465896f8 100644 --- a/test/plugins.js +++ b/test/plugins.js @@ -1,7 +1,6 @@ 'use strict'; - -const assert = require('assert'); +const assert = require('assert'); const path = require('path'); const nconf = require('nconf'); const request = require('request'); @@ -47,7 +46,7 @@ describe('Plugins', () => { }); }); - it('should register and fire a filter hook having 3 methods, one returning a promise, one calling the callback and one just returning', async () => { + it('should register and fire a filter hook having 3 methods', async () => { function method1(data, callback) { data.foo += 1; callback(null, data); @@ -214,6 +213,16 @@ describe('Plugins', () => { describe('install/activate/uninstall', () => { let latest; const pluginName = 'nodebb-plugin-imgur'; + const oldValue = process.env.NODE_ENV; + before((done) => { + process.env.NODE_ENV = 'development'; + done(); + }); + after((done) => { + process.env.NODE_ENV = oldValue; + done(); + }); + it('should install a plugin', function (done) { this.timeout(0); plugins.toggleInstall(pluginName, '1.0.16', (err, pluginData) => { @@ -284,7 +293,8 @@ describe('Plugins', () => { }); it('should 404 if resource does not exist', (done) => { - request.get(`${nconf.get('url')}/plugins/nodebb-plugin-dbsearch/dbsearch/templates/admin/plugins/should404.tpl`, (err, res, body) => { + const url = `${nconf.get('url')}/plugins/nodebb-plugin-dbsearch/dbsearch/templates/admin/plugins/should404.tpl`; + request.get(url, (err, res, body) => { assert.ifError(err); assert.equal(res.statusCode, 404); assert(body); @@ -293,7 +303,8 @@ describe('Plugins', () => { }); it('should get resource', (done) => { - request.get(`${nconf.get('url')}/plugins/nodebb-plugin-dbsearch/dbsearch/templates/admin/plugins/dbsearch.tpl`, (err, res, body) => { + const url = `${nconf.get('url')}/plugins/nodebb-plugin-dbsearch/dbsearch/templates/admin/plugins/dbsearch.tpl`; + request.get(url, (err, res, body) => { assert.ifError(err); assert.equal(res.statusCode, 200); assert(body); @@ -302,3 +313,5 @@ describe('Plugins', () => { }); }); }); + + diff --git a/test/socket.io.js b/test/socket.io.js index b707de09a0..fad6591185 100644 --- a/test/socket.io.js +++ b/test/socket.io.js @@ -106,7 +106,12 @@ describe('socket.io', () => { }); it('should post a topic', (done) => { - io.emit('topics.post', { title: 'test topic title', content: 'test topic main post content', uid: adminUid, cid: cid }, (err, result) => { + io.emit('topics.post', { + title: 'test topic title', + content: 'test topic main post content', + uid: adminUid, + cid: cid, + }, (err, result) => { assert.ifError(err); assert.equal(result.user.username, 'admin'); assert.equal(result.category.cid, cid); @@ -473,9 +478,17 @@ describe('socket.io', () => { it('should toggle plugin install', function (done) { this.timeout(0); - socketAdmin.plugins.toggleInstall({ uid: adminUid }, { id: 'nodebb-plugin-location-to-map', version: 'latest' }, (err, data) => { + const oldValue = process.env.NODE_ENV; + process.env.NODE_ENV = 'development'; + socketAdmin.plugins.toggleInstall({ + uid: adminUid, + }, { + id: 'nodebb-plugin-location-to-map', + version: 'latest', + }, (err, data) => { assert.ifError(err); assert.equal(data.name, 'nodebb-plugin-location-to-map'); + process.env.NODE_ENV = oldValue; done(); }); }); @@ -507,8 +520,16 @@ describe('socket.io', () => { it('should upgrade plugin', function (done) { this.timeout(0); - socketAdmin.plugins.upgrade({ uid: adminUid }, { id: 'nodebb-plugin-location-to-map', version: 'latest' }, (err) => { + const oldValue = process.env.NODE_ENV; + process.env.NODE_ENV = 'development'; + socketAdmin.plugins.upgrade({ + uid: adminUid, + }, { + id: 'nodebb-plugin-location-to-map', + version: 'latest', + }, (err) => { assert.ifError(err); + process.env.NODE_ENV = oldValue; done(); }); }); @@ -521,7 +542,13 @@ describe('socket.io', () => { }); it('should error with invalid data', (done) => { - const data = [{ template: 'global', location: 'sidebar', widgets: [{ widget: 'html', data: { html: 'test', title: 'test', container: '' } }] }]; + const data = [ + { + template: 'global', + location: 'sidebar', + widgets: [{ widget: 'html', data: { html: 'test', title: 'test', container: '' } }], + }, + ]; socketAdmin.widgets.set({ uid: adminUid }, data, (err) => { assert.ifError(err); db.getObjectField('widgets:global', 'sidebar', (err, widgetData) => { From fb0588576da09055afb8038be768d39b64772781 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 4 Nov 2021 09:07:12 +0000 Subject: [PATCH 48/95] Latest translations and fallbacks --- public/language/bg/admin/settings/navigation.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/language/bg/admin/settings/navigation.json b/public/language/bg/admin/settings/navigation.json index 5e53ebbcfd..34dc2112d8 100644 --- a/public/language/bg/admin/settings/navigation.json +++ b/public/language/bg/admin/settings/navigation.json @@ -11,8 +11,8 @@ "properties": "Свойства:", "groups": "Групи:", "open-new-window": "Отваряне в нов прозорец", - "dropdown": "Dropdown", - "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", + "dropdown": "Падащо меню", + "dropdown-placeholder": "Въведете елементите на падащото меню по-долу. Пример:
<li><a href="https://myforum.com">Връзка 1</a></li>", "btn.delete": "Изтриване", "btn.disable": "Изключване", From 66e7cdac7a61726c80ed5a4311c70b39d570533c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 4 Nov 2021 11:45:06 -0400 Subject: [PATCH 49/95] fix: #9973, ignore if assigning to same parent --- src/categories/update.js | 3 +++ test/categories.js | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/categories/update.js b/src/categories/update.js index cdca138635..04650a4c46 100644 --- a/src/categories/update.js +++ b/src/categories/update.js @@ -71,6 +71,9 @@ module.exports = function (Categories) { } const categoryData = await Categories.getCategoryFields(cid, ['parentCid', 'order']); const oldParent = categoryData.parentCid; + if (oldParent === newParent) { + return; + } await Promise.all([ db.sortedSetRemove(`cid:${oldParent}:children`, cid), db.sortedSetAdd(`cid:${newParent}:children`, categoryData.order, cid), diff --git a/test/categories.js b/test/categories.js index d1e5cbf746..e91a51f619 100644 --- a/test/categories.js +++ b/test/categories.js @@ -432,6 +432,26 @@ describe('Categories', () => { }); }); + 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 = {}; + updateData[cid] = { + parentCid: parentCat.cid, + }; + await Categories.update(updateData); + let data = await Categories.getCategoryData(cid); + assert.equal(data.parentCid, updateData[cid].parentCid); + let childrenCids = await db.getSortedSetRange(`cid:${parentCat.cid}:children`, 0, -1); + assert(childrenCids.includes(String(cid))); + + // update again to same parent + await Categories.update(updateData); + data = await Categories.getCategoryData(cid); + assert.equal(data.parentCid, updateData[cid].parentCid); + childrenCids = await db.getSortedSetRange(`cid:${parentCat.cid}:children`, 0, -1); + assert(childrenCids.includes(String(cid))); + }); + it('should purge category', (done) => { Categories.create({ name: 'purge me', From 054685265d0b5e625a3e5f751e97940fbbb4fca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 4 Nov 2021 13:19:37 -0400 Subject: [PATCH 50/95] fix: category load more btn visibility --- public/src/client/category.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/src/client/category.js b/public/src/client/category.js index 03d63bae86..da8a6296cf 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -107,7 +107,8 @@ define('forum/category', [ app.createUserTooltips(html); ajaxify.data.nextSubCategoryStart += ajaxify.data.subCategoriesPerPage; ajaxify.data.subCategoriesLeft -= data.length; - btn.translateText('[[category:x-more-categories, ' + ajaxify.data.subCategoriesLeft + ']]'); + btn.toggleClass('hidden', ajaxify.data.subCategoriesLeft <= 0) + .translateText('[[category:x-more-categories, ' + ajaxify.data.subCategoriesLeft + ']]'); }); }); return false; From c1cc35a949ec531cdbdb2ab612087a7359925d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 4 Nov 2021 14:23:16 -0400 Subject: [PATCH 51/95] refactor: display errors from category drag/drop --- public/src/admin/manage/categories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index c8a8a10bfd..23c85892a4 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -208,7 +208,7 @@ define('admin/manage/categories', [ } newCategoryId = -1; - api.put('/categories/' + cid, modified[cid]); + api.put('/categories/' + cid, modified[cid]).catch(app.alertError); } } From 9e1d8da643ac39f6d82228b1b78fdfb207108d6b Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 5 Nov 2021 09:06:51 +0000 Subject: [PATCH 52/95] Latest translations and fallbacks --- public/language/vi/admin/settings/navigation.json | 4 ++-- public/language/vi/admin/settings/post.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/vi/admin/settings/navigation.json b/public/language/vi/admin/settings/navigation.json index 9f41b189e4..22ce457fb4 100644 --- a/public/language/vi/admin/settings/navigation.json +++ b/public/language/vi/admin/settings/navigation.json @@ -11,8 +11,8 @@ "properties": "Thuộc tính:", "groups": "Nhóm:", "open-new-window": "Mở trong một cửa sổ mới", - "dropdown": "Dropdown", - "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", + "dropdown": "Thả xuống", + "dropdown-placeholder": "Đặt các mục menu thả xuống của bạn bên dưới, tức là:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Xóa", "btn.disable": "Tắt", diff --git a/public/language/vi/admin/settings/post.json b/public/language/vi/admin/settings/post.json index 983c9f0902..db7602bd43 100644 --- a/public/language/vi/admin/settings/post.json +++ b/public/language/vi/admin/settings/post.json @@ -40,7 +40,7 @@ "teaser.last-post": "Gần đây – Hiển thị bài đăng mới nhất, bao gồm cả bài gốc, nếu không có câu trả lời", "teaser.last-reply": "Cuối cùng - Hiển thị câu trả lời mới nhất hoặc trình giữ chỗ \"Không trả lời\" nếu không có câu trả lời", "teaser.first": "Đầu tiên", - "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", + "showPostPreviewsOnHover": "Hiển thị bản xem trước của các bài đăng khi di chuột qua", "unread": "Cài Đặt Chưa Đọc", "unread.cutoff": "Số ngày giới hạn chưa đọc", "unread.min-track-last": "Số bài viết tối thiểu trong chủ đề trước khi theo dõi lần đọc cuối cùng", From 41e02400103073b69da7e127c3feb30ea68831c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 5 Nov 2021 13:20:13 -0400 Subject: [PATCH 53/95] fix: dont show previews on mobile --- public/src/client/topic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 478883b62e..03bdeb0736 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -175,7 +175,7 @@ define('forum/topic', [ } function addPostsPreviewHandler() { - if (!ajaxify.data.showPostPreviewsOnHover) { + if (!ajaxify.data.showPostPreviewsOnHover || utils.isMobile()) { return; } let timeoutId = 0; From 9bfb6c72814e957164bac12f3845428e2bdad4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 5 Nov 2021 14:11:03 -0400 Subject: [PATCH 54/95] fix: #9976, handle array or object --- src/search.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/search.js b/src/search.js index 0a0d1f459c..d71430c437 100644 --- a/src/search.js +++ b/src/search.js @@ -45,14 +45,16 @@ async function searchInContent(data) { async function doSearch(type, searchIn) { if (searchIn.includes(data.searchIn)) { - return await plugins.hooks.fire('filter:search.query', { + const result = await plugins.hooks.fire('filter:search.query', { index: type, content: data.query, matchWords: data.matchWords || 'all', cid: searchCids, uid: searchUids, searchData: data, + ids: [], }); + return Array.isArray(result) ? result : result.ids; } return []; } From 28dd31a8e7053449710228df178384eb825e1d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 5 Nov 2021 14:12:45 -0400 Subject: [PATCH 55/95] fix: #9976 --- src/topics/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/topics/index.js b/src/topics/index.js index 06a6879c6c..67614927ae 100644 --- a/src/topics/index.js +++ b/src/topics/index.js @@ -319,11 +319,12 @@ Topics.isLocked = async function (tid) { }; Topics.search = async function (tid, term) { - const pids = await plugins.hooks.fire('filter:topic.search', { + const result = await plugins.hooks.fire('filter:topic.search', { tid: tid, term: term, + ids: [], }); - return Array.isArray(pids) ? pids : []; + return Array.isArray(result) ? result : result.ids; }; require('../promisify')(Topics); From 4ac9270a2ab94d80bf02481a5a6e639524c2bed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 5 Nov 2021 14:25:43 -0400 Subject: [PATCH 56/95] test: increase timeout --- test/messaging.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/messaging.js b/test/messaging.js index fbec60234f..996ad14bdb 100644 --- a/test/messaging.js +++ b/test/messaging.js @@ -408,7 +408,7 @@ describe('Messaging Library', () => { await db.sortedSetAdd('users:online', Date.now() - ((meta.config.onlineCutoff * 60000) + 50000), herpUid); await socketModules.chats.send({ uid: fooUid }, { roomId: roomId, message: 'second chat message **bold** text' }); - await sleep(1500); + await sleep(3000); const data = await User.notifications.get(herpUid); assert(data.unread[0]); const notification = data.unread[0]; From f7295aaad5ede350f707197900e9e29a36f047f6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 5 Nov 2021 18:26:55 +0000 Subject: [PATCH 57/95] fix(deps): update dependency nodebb-theme-lavender to v5.3.1 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index fa2455cf70..8a08d5e1ce 100644 --- a/install/package.json +++ b/install/package.json @@ -92,7 +92,7 @@ "nodebb-plugin-mentions": "3.0.0", "nodebb-plugin-spam-be-gone": "0.7.10", "nodebb-rewards-essentials": "0.2.0", - "nodebb-theme-lavender": "5.2.1", + "nodebb-theme-lavender": "5.3.1", "nodebb-theme-persona": "11.2.21", "nodebb-theme-slick": "1.4.15", "nodebb-theme-vanilla": "12.1.9", From 91293ecc6ddcd2a12401d6b31be6088f82edaeb8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 5 Nov 2021 18:26:40 +0000 Subject: [PATCH 58/95] fix(deps): update dependency nodebb-plugin-spam-be-gone to v0.7.11 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 8a08d5e1ce..2bfa4d104d 100644 --- a/install/package.json +++ b/install/package.json @@ -90,7 +90,7 @@ "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "8.14.4", "nodebb-plugin-mentions": "3.0.0", - "nodebb-plugin-spam-be-gone": "0.7.10", + "nodebb-plugin-spam-be-gone": "0.7.11", "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.3.1", "nodebb-theme-persona": "11.2.21", From 8224a2a930082c7ac17224b3758a24b06f6e9926 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Nov 2021 15:47:36 -0400 Subject: [PATCH 59/95] fix(deps): update dependency nodebb-plugin-mentions to v3.0.1 (#9979) Co-authored-by: Renovate Bot Co-authored-by: Julian Lam --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 2bfa4d104d..7b7eb0efee 100644 --- a/install/package.json +++ b/install/package.json @@ -89,7 +89,7 @@ "nodebb-plugin-emoji": "^3.5.0", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "8.14.4", - "nodebb-plugin-mentions": "3.0.0", + "nodebb-plugin-mentions": "3.0.1", "nodebb-plugin-spam-be-gone": "0.7.11", "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.3.1", From 7fee0e32722f6a961a32a3abd0bb9a3c2017cf26 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 5 Nov 2021 19:46:46 +0000 Subject: [PATCH 60/95] fix(deps): update dependency nodebb-plugin-composer-default to v7.0.12 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 7b7eb0efee..ee563a35da 100644 --- a/install/package.json +++ b/install/package.json @@ -84,7 +84,7 @@ "multiparty": "4.2.2", "@nodebb/bootswatch": "3.4.2", "nconf": "^0.11.2", - "nodebb-plugin-composer-default": "7.0.11", + "nodebb-plugin-composer-default": "7.0.12", "nodebb-plugin-dbsearch": "5.0.5", "nodebb-plugin-emoji": "^3.5.0", "nodebb-plugin-emoji-android": "2.0.5", From 3386893b58673fb8d6b04b43638ed6c70fb52842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 5 Nov 2021 18:14:08 -0400 Subject: [PATCH 61/95] test: dbsearch no longer has staticDir --- test/build.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/build.js b/test/build.js index 41bc2f24c9..0727bc6d27 100644 --- a/test/build.js +++ b/test/build.js @@ -130,7 +130,6 @@ describe('Build', (done) => { it('should build plugin static dirs', (done) => { build.build(['plugin static dirs'], (err) => { assert.ifError(err); - assert(file.existsSync(path.join(__dirname, '../build/public/plugins/nodebb-plugin-dbsearch/dbsearch'))); done(); }); }); From 4f1ee1fcb14faba6d18986a1c1ed639213840966 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Nov 2021 18:16:36 -0400 Subject: [PATCH 62/95] fix(deps): update dependency nodebb-plugin-dbsearch to v5.1.0 (#9983) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ee563a35da..a9be5da3fc 100644 --- a/install/package.json +++ b/install/package.json @@ -85,7 +85,7 @@ "@nodebb/bootswatch": "3.4.2", "nconf": "^0.11.2", "nodebb-plugin-composer-default": "7.0.12", - "nodebb-plugin-dbsearch": "5.0.5", + "nodebb-plugin-dbsearch": "5.1.0", "nodebb-plugin-emoji": "^3.5.0", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "8.14.4", From 30cce14204f3f38e897a7f06f20be7fa5c0f7a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 5 Nov 2021 20:21:19 -0400 Subject: [PATCH 63/95] test: fix tpl test --- test/plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/plugins.js b/test/plugins.js index 04465896f8..1b9864a920 100644 --- a/test/plugins.js +++ b/test/plugins.js @@ -303,7 +303,7 @@ describe('Plugins', () => { }); it('should get resource', (done) => { - const url = `${nconf.get('url')}/plugins/nodebb-plugin-dbsearch/dbsearch/templates/admin/plugins/dbsearch.tpl`; + const url = `${nconf.get('url')}/assets/templates/admin/plugins/dbsearch.tpl`; request.get(url, (err, res, body) => { assert.ifError(err); assert.equal(res.statusCode, 200); From 8a12ac34703661e32784e16a8c90d6fdc18c347e Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sat, 6 Nov 2021 09:06:33 +0000 Subject: [PATCH 64/95] Latest translations and fallbacks --- public/language/fr/admin/settings/navigation.json | 4 ++-- public/language/fr/admin/settings/post.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/fr/admin/settings/navigation.json b/public/language/fr/admin/settings/navigation.json index 857177d2b2..1305aed145 100644 --- a/public/language/fr/admin/settings/navigation.json +++ b/public/language/fr/admin/settings/navigation.json @@ -11,8 +11,8 @@ "properties": "Propriétés :", "groups": "Groupes:", "open-new-window": "Ouvrir dans une nouvelle fenêtre", - "dropdown": "Dropdown", - "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", + "dropdown": "Menu déroulant", + "dropdown-placeholder": "Placez vos éléments de menu déroulant ci-dessous, par exemple :
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Supprimer", "btn.disable": "Désactiver", diff --git a/public/language/fr/admin/settings/post.json b/public/language/fr/admin/settings/post.json index 96ef48543c..9a546492b1 100644 --- a/public/language/fr/admin/settings/post.json +++ b/public/language/fr/admin/settings/post.json @@ -40,7 +40,7 @@ "teaser.last-post": "Dernier – Affiche le dernier message, ou celui d'origine, si il n'y a pas de réponse", "teaser.last-reply": "Dernier – Affiche le dernier message, ou \"Aucune réponse\" si il n'y a pas de réponse", "teaser.first": "Premier", - "showPostPreviewsOnHover": "Show a preview of posts when mouse overed", + "showPostPreviewsOnHover": "Afficher un aperçu des messages au survol des liens", "unread": "Paramètres des messages non lus", "unread.cutoff": "Nombre de jours pour les messages non-lus", "unread.min-track-last": "Nombre minimum de messages dans le sujet avant de garder en mémoire le dernier message lu", From 890bf03fcc6905fe1cbe0191a34969b00b360f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 6 Nov 2021 21:20:05 -0400 Subject: [PATCH 65/95] refactor: acp only uses 3 modes and a single theme so only copy 7 files to build folder instead of 400+ --- src/meta/js.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/meta/js.js b/src/meta/js.js index 63a7d84126..8e712ccf15 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -89,7 +89,16 @@ JS.scripts = { 'cropper.js': 'node_modules/cropperjs/dist/cropper.min.js', 'jquery-ui': 'node_modules/jquery-ui/ui', 'zxcvbn.js': 'node_modules/zxcvbn/dist/zxcvbn.js', - ace: 'node_modules/ace-builds/src-min', + + // only get ace files required by acp + 'ace/ace.js': 'node_modules/ace-builds/src-min/ace.js', + 'ace/mode-less.js': 'node_modules/ace-builds/src-min/mode-less.js', + 'ace/mode-javascript.js': 'node_modules/ace-builds/src-min/mode-javascript.js', + 'ace/mode-html.js': 'node_modules/ace-builds/src-min/mode-html.js', + 'ace/theme-twilight.js': 'node_modules/ace-builds/src-min/theme-twilight.js', + 'ace/worker-javascript.js': 'node_modules/ace-builds/src-min/worker-javascript.js', + 'ace/worker-html.js': 'node_modules/ace-builds/src-min/worker-html.js', + 'clipboard.js': 'node_modules/clipboard/dist/clipboard.min.js', 'tinycon.js': 'node_modules/tinycon/tinycon.js', 'slideout.js': 'node_modules/slideout/dist/slideout.min.js', From 4b738c8cd36c936a1dbe2bb900c694bf6c5520ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 6 Nov 2021 22:07:06 -0400 Subject: [PATCH 66/95] refactor: cleanup info, better cpu usage % --- .../en-GB/admin/development/info.json | 6 ++++- src/controllers/admin/info.js | 26 +++++++++++++------ src/views/admin/development/info.tpl | 13 +++++++--- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/public/language/en-GB/admin/development/info.json b/public/language/en-GB/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/en-GB/admin/development/info.json +++ b/public/language/en-GB/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/src/controllers/admin/info.js b/src/controllers/admin/info.js index 60558f2ad6..efd126579e 100644 --- a/src/controllers/admin/info.js +++ b/src/controllers/admin/info.js @@ -11,6 +11,8 @@ const rooms = require('../../socket.io/admin/rooms'); const infoController = module.exports; let info = {}; +let previousUsage = process.cpuUsage(); +let usageStartDate = Date.now(); infoController.get = function (req, res) { info = {}; @@ -69,7 +71,7 @@ async function getNodeInfo() { version: process.version, memoryUsage: process.memoryUsage(), uptime: process.uptime(), - cpuUsage: process.cpuUsage(), + cpuUsage: getCpuUsage(), }, os: { hostname: os.hostname(), @@ -88,14 +90,12 @@ async function getNodeInfo() { jobsDisabled: nconf.get('jobsDisabled'), }, }; - data.process.cpuUsage.user /= 1000000; - data.process.cpuUsage.user = data.process.cpuUsage.user.toFixed(2); - data.process.cpuUsage.system /= 1000000; - data.process.cpuUsage.system = data.process.cpuUsage.system.toFixed(2); - data.process.memoryUsage.humanReadable = (data.process.memoryUsage.rss / (1024 * 1024)).toFixed(2); + + data.process.memoryUsage.humanReadable = (data.process.memoryUsage.rss / (1024 * 1024 * 1024)).toFixed(3); data.process.uptimeHumanReadable = humanReadableUptime(data.process.uptime); - data.os.freemem = (data.os.freemem / 1000000).toFixed(2); - data.os.totalmem = (data.os.totalmem / 1000000).toFixed(2); + data.os.freemem = (data.os.freemem / (1024 * 1024 * 1024)).toFixed(2); + data.os.totalmem = (data.os.totalmem / (1024 * 1024 * 1024)).toFixed(2); + data.os.usedmem = (data.os.totalmem - data.os.freemem).toFixed(2); const [stats, gitInfo] = await Promise.all([ rooms.getLocalStats(), getGitInfo(), @@ -105,6 +105,16 @@ async function getNodeInfo() { return data; } +function getCpuUsage() { + const newUsage = process.cpuUsage(); + const diff = (newUsage.user + newUsage.system) - (previousUsage.user + previousUsage.system); + const now = Date.now(); + const result = diff / ((now - usageStartDate) * 1000) * 100; + previousUsage = newUsage; + usageStartDate = now; + return result.toFixed(2); +} + function humanReadableUptime(seconds) { if (seconds < 60) { return `${Math.floor(seconds)}s`; diff --git a/src/views/admin/development/info.tpl b/src/views/admin/development/info.tpl index 604e13bfb7..bb113ab0d9 100644 --- a/src/views/admin/development/info.tpl +++ b/src/views/admin/development/info.tpl @@ -17,7 +17,8 @@ [[admin/development/info:online]] [[admin/development/info:git]] [[admin/development/info:cpu-usage]] - [[admin/development/info:memory]] + [[admin/development/info:process-memory]] + [[admin/development/info:system-memory]] [[admin/development/info:load]] [[admin/development/info:uptime]] @@ -38,8 +39,14 @@ {info.stats.socketCount} {info.git.branch}@{info.git.hashShort} - {info.process.cpuUsage.user} / {info.process.cpuUsage.system} - {info.process.memoryUsage.humanReadable} mb / {info.os.freemem} mb + {info.process.cpuUsage}% + + {info.process.memoryUsage.humanReadable} gb + + + {info.os.usedmem} gb / + {info.os.totalmem} gb + {info.os.load} {info.process.uptimeHumanReadable} From 91676c6c7cf29f631da2cf084635d17bba464f58 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sun, 7 Nov 2021 02:07:52 +0000 Subject: [PATCH 67/95] chore(i18n): fallback strings for new resources: nodebb.admin-development-info --- public/language/ar/admin/development/info.json | 6 +++++- public/language/bg/admin/development/info.json | 6 +++++- public/language/bn/admin/development/info.json | 6 +++++- public/language/cs/admin/development/info.json | 6 +++++- public/language/da/admin/development/info.json | 6 +++++- public/language/de/admin/development/info.json | 6 +++++- public/language/el/admin/development/info.json | 6 +++++- public/language/en-US/admin/development/info.json | 6 +++++- public/language/en-x-pirate/admin/development/info.json | 6 +++++- public/language/es/admin/development/info.json | 6 +++++- public/language/et/admin/development/info.json | 6 +++++- public/language/fa-IR/admin/development/info.json | 6 +++++- public/language/fi/admin/development/info.json | 6 +++++- public/language/fr/admin/development/info.json | 6 +++++- public/language/gl/admin/development/info.json | 6 +++++- public/language/he/admin/development/info.json | 6 +++++- public/language/hr/admin/development/info.json | 6 +++++- public/language/hu/admin/development/info.json | 6 +++++- public/language/id/admin/development/info.json | 6 +++++- public/language/it/admin/development/info.json | 6 +++++- public/language/ja/admin/development/info.json | 6 +++++- public/language/ko/admin/development/info.json | 6 +++++- public/language/lt/admin/development/info.json | 6 +++++- public/language/lv/admin/development/info.json | 6 +++++- public/language/ms/admin/development/info.json | 6 +++++- public/language/nb/admin/development/info.json | 6 +++++- public/language/nl/admin/development/info.json | 6 +++++- public/language/pl/admin/development/info.json | 6 +++++- public/language/pt-BR/admin/development/info.json | 6 +++++- public/language/pt-PT/admin/development/info.json | 6 +++++- public/language/ro/admin/development/info.json | 6 +++++- public/language/ru/admin/development/info.json | 6 +++++- public/language/rw/admin/development/info.json | 6 +++++- public/language/sc/admin/development/info.json | 6 +++++- public/language/sk/admin/development/info.json | 6 +++++- public/language/sl/admin/development/info.json | 6 +++++- public/language/sr/admin/development/info.json | 6 +++++- public/language/sv/admin/development/info.json | 6 +++++- public/language/th/admin/development/info.json | 6 +++++- public/language/tr/admin/development/info.json | 6 +++++- public/language/uk/admin/development/info.json | 6 +++++- public/language/vi/admin/development/info.json | 6 +++++- public/language/zh-CN/admin/development/info.json | 6 +++++- public/language/zh-TW/admin/development/info.json | 6 +++++- 44 files changed, 220 insertions(+), 44 deletions(-) diff --git a/public/language/ar/admin/development/info.json b/public/language/ar/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/ar/admin/development/info.json +++ b/public/language/ar/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/bg/admin/development/info.json b/public/language/bg/admin/development/info.json index 01e90f0a73..c03576fce6 100644 --- a/public/language/bg/admin/development/info.json +++ b/public/language/bg/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "на линия", "git": "git", - "memory": "памет", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "натоварване на системата", "cpu-usage": "използване на процесора", "uptime": "активно време", diff --git a/public/language/bn/admin/development/info.json b/public/language/bn/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/bn/admin/development/info.json +++ b/public/language/bn/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/cs/admin/development/info.json b/public/language/cs/admin/development/info.json index a70c980f85..c47e061cb2 100644 --- a/public/language/cs/admin/development/info.json +++ b/public/language/cs/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "připojen", "git": "git", - "memory": "paměť", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "zatížení systému", "cpu-usage": "využití CPU", "uptime": "čas spuštění", diff --git a/public/language/da/admin/development/info.json b/public/language/da/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/da/admin/development/info.json +++ b/public/language/da/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/de/admin/development/info.json b/public/language/de/admin/development/info.json index 8c04a3a0f0..c0b65f6781 100644 --- a/public/language/de/admin/development/info.json +++ b/public/language/de/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "Node.js Version", "online": "Online", "git": "git", - "memory": "Speicher", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "Systemlast", "cpu-usage": "CPU Benutzung", "uptime": "Uptime", diff --git a/public/language/el/admin/development/info.json b/public/language/el/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/el/admin/development/info.json +++ b/public/language/el/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/en-US/admin/development/info.json b/public/language/en-US/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/en-US/admin/development/info.json +++ b/public/language/en-US/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/en-x-pirate/admin/development/info.json b/public/language/en-x-pirate/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/en-x-pirate/admin/development/info.json +++ b/public/language/en-x-pirate/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/es/admin/development/info.json b/public/language/es/admin/development/info.json index 385c3a56a9..5f934d3a40 100644 --- a/public/language/es/admin/development/info.json +++ b/public/language/es/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "en-linea", "git": "git", - "memory": "memoria", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "carga del sistema", "cpu-usage": "uso del cpu", "uptime": "tiempo de actividad", diff --git a/public/language/et/admin/development/info.json b/public/language/et/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/et/admin/development/info.json +++ b/public/language/et/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/fa-IR/admin/development/info.json b/public/language/fa-IR/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/fa-IR/admin/development/info.json +++ b/public/language/fa-IR/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/fi/admin/development/info.json b/public/language/fi/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/fi/admin/development/info.json +++ b/public/language/fi/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/fr/admin/development/info.json b/public/language/fr/admin/development/info.json index 479b30a80f..5be9541a32 100644 --- a/public/language/fr/admin/development/info.json +++ b/public/language/fr/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "en ligne", "git": "git", - "memory": "mémoire", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "Charge du système", "cpu-usage": "Utilisation du processeur", "uptime": "disponibilité", diff --git a/public/language/gl/admin/development/info.json b/public/language/gl/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/gl/admin/development/info.json +++ b/public/language/gl/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/he/admin/development/info.json b/public/language/he/admin/development/info.json index 4c60fef05a..83bdfa2cc7 100644 --- a/public/language/he/admin/development/info.json +++ b/public/language/he/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "מקוון", "git": "git", - "memory": "זיכרון", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "טעינת מערכת", "cpu-usage": "שימוש ב-CPU", "uptime": "משך זמן פעולת המערכת ללא השבתה", diff --git a/public/language/hr/admin/development/info.json b/public/language/hr/admin/development/info.json index 888f9f053f..0eb118a954 100644 --- a/public/language/hr/admin/development/info.json +++ b/public/language/hr/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "Na mreži", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/hu/admin/development/info.json b/public/language/hu/admin/development/info.json index fb32d22f96..d67e35f340 100644 --- a/public/language/hu/admin/development/info.json +++ b/public/language/hu/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memória", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "üzemidő", diff --git a/public/language/id/admin/development/info.json b/public/language/id/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/id/admin/development/info.json +++ b/public/language/id/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/it/admin/development/info.json b/public/language/it/admin/development/info.json index 2d32a277a5..174bc38169 100644 --- a/public/language/it/admin/development/info.json +++ b/public/language/it/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memoria", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "carico sistema", "cpu-usage": "uso CPU", "uptime": "tempo di caricamento", diff --git a/public/language/ja/admin/development/info.json b/public/language/ja/admin/development/info.json index 8d70eb611c..f70dd00849 100644 --- a/public/language/ja/admin/development/info.json +++ b/public/language/ja/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "オンライン", "git": "git", - "memory": "メモリ", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "稼働時間", diff --git a/public/language/ko/admin/development/info.json b/public/language/ko/admin/development/info.json index 6b921c1d08..640110f2d0 100644 --- a/public/language/ko/admin/development/info.json +++ b/public/language/ko/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "온라인", "git": "git", - "memory": "메모리", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "시스템 로드", "cpu-usage": "cpu 사용량", "uptime": "업타임", diff --git a/public/language/lt/admin/development/info.json b/public/language/lt/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/lt/admin/development/info.json +++ b/public/language/lt/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/lv/admin/development/info.json b/public/language/lv/admin/development/info.json index a8230d80e3..d07a526789 100644 --- a/public/language/lv/admin/development/info.json +++ b/public/language/lv/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "tiešsaistē", "git": "git", - "memory": "atmiņa", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "darbspējas laiks", diff --git a/public/language/ms/admin/development/info.json b/public/language/ms/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/ms/admin/development/info.json +++ b/public/language/ms/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/nb/admin/development/info.json b/public/language/nb/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/nb/admin/development/info.json +++ b/public/language/nb/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/nl/admin/development/info.json b/public/language/nl/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/nl/admin/development/info.json +++ b/public/language/nl/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/pl/admin/development/info.json b/public/language/pl/admin/development/info.json index 117a8c0c56..3cfe72b22d 100644 --- a/public/language/pl/admin/development/info.json +++ b/public/language/pl/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "dostępny", "git": "git", - "memory": "pamięć", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "obciążenie systemu", "cpu-usage": "użycie procesora", "uptime": "czas działania", diff --git a/public/language/pt-BR/admin/development/info.json b/public/language/pt-BR/admin/development/info.json index cb67c31ed3..e1a5b6b618 100644 --- a/public/language/pt-BR/admin/development/info.json +++ b/public/language/pt-BR/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memória", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "carga do sistema", "cpu-usage": "uso da cpu", "uptime": "tempo de atividade", diff --git a/public/language/pt-PT/admin/development/info.json b/public/language/pt-PT/admin/development/info.json index 1bbac03c82..e88ef6e50d 100644 --- a/public/language/pt-PT/admin/development/info.json +++ b/public/language/pt-PT/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memória", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "carga do sistema", "cpu-usage": "uso cpu", "uptime": "tempo de atividade", diff --git a/public/language/ro/admin/development/info.json b/public/language/ro/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/ro/admin/development/info.json +++ b/public/language/ro/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/ru/admin/development/info.json b/public/language/ru/admin/development/info.json index 0087dac3a0..63d6faae67 100644 --- a/public/language/ru/admin/development/info.json +++ b/public/language/ru/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "онлайн", "git": "git", - "memory": "память", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "системная загрузка", "cpu-usage": "загрузка процессора", "uptime": "продолжительность работы", diff --git a/public/language/rw/admin/development/info.json b/public/language/rw/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/rw/admin/development/info.json +++ b/public/language/rw/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/sc/admin/development/info.json b/public/language/sc/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/sc/admin/development/info.json +++ b/public/language/sc/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/sk/admin/development/info.json b/public/language/sk/admin/development/info.json index 1fec788589..62f5cb9863 100644 --- a/public/language/sk/admin/development/info.json +++ b/public/language/sk/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "pripojený", "git": "git", - "memory": "pamäť", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "čas spustenia", diff --git a/public/language/sl/admin/development/info.json b/public/language/sl/admin/development/info.json index 7187011bb0..4c469cc598 100644 --- a/public/language/sl/admin/development/info.json +++ b/public/language/sl/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "na spletu", "git": "git", - "memory": "spomin", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "obremenitev sistema", "cpu-usage": "uporaba procesorja", "uptime": "čas delovanja", diff --git a/public/language/sr/admin/development/info.json b/public/language/sr/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/sr/admin/development/info.json +++ b/public/language/sr/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/sv/admin/development/info.json b/public/language/sv/admin/development/info.json index 1003af1a5f..11202d9c3a 100644 --- a/public/language/sv/admin/development/info.json +++ b/public/language/sv/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "memory", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/th/admin/development/info.json b/public/language/th/admin/development/info.json index f19273f0f9..504759aa23 100644 --- a/public/language/th/admin/development/info.json +++ b/public/language/th/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "หน่วยความจำ", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "ระยะเวลาการทำงาน", diff --git a/public/language/tr/admin/development/info.json b/public/language/tr/admin/development/info.json index 2feb725487..4f80b51f8d 100644 --- a/public/language/tr/admin/development/info.json +++ b/public/language/tr/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "çevrimiçi", "git": "git", - "memory": "hafıza", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "sistem yüklemesi", "cpu-usage": "cpu kullanımı", "uptime": "kesintisiz çalışma süresi", diff --git a/public/language/uk/admin/development/info.json b/public/language/uk/admin/development/info.json index ed7b89737e..c28dc7bb38 100644 --- a/public/language/uk/admin/development/info.json +++ b/public/language/uk/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "memory": "пам'ять", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "system load", "cpu-usage": "cpu usage", "uptime": "uptime", diff --git a/public/language/vi/admin/development/info.json b/public/language/vi/admin/development/info.json index 3b14058737..8d9d08806b 100644 --- a/public/language/vi/admin/development/info.json +++ b/public/language/vi/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "trực tuyến", "git": "git", - "memory": "bộ nhớ", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "tải hệ thống", "cpu-usage": "sử dụng cpu", "uptime": "thời gian hoạt động", diff --git a/public/language/zh-CN/admin/development/info.json b/public/language/zh-CN/admin/development/info.json index 4cf78389ba..8d4e8b4678 100644 --- a/public/language/zh-CN/admin/development/info.json +++ b/public/language/zh-CN/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "在线", "git": "git", - "memory": "内存", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "系统负载", "cpu-usage": "CPU 使用情况", "uptime": "运行时间", diff --git a/public/language/zh-TW/admin/development/info.json b/public/language/zh-TW/admin/development/info.json index fc6c50e514..9b2d42dcfd 100644 --- a/public/language/zh-TW/admin/development/info.json +++ b/public/language/zh-TW/admin/development/info.json @@ -8,7 +8,11 @@ "nodejs": "nodejs", "online": "在線", "git": "git", - "memory": "記憶體", + "process-memory": "process memory", + "system-memory": "system memory", + "used-memory-process": "Used memory by process", + "used-memory-os": "Used system memory", + "total-memory-os": "Total system memory", "load": "系統負載", "cpu-usage": "CPU 使用情況", "uptime": "運行時間", From c1f5889f1384e92085bd505206b59c26049e4b19 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 7 Nov 2021 18:47:05 +0000 Subject: [PATCH 68/95] fix(deps): update dependency html-to-text to v8.1.0 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index a9be5da3fc..4c0ee01e8d 100644 --- a/install/package.json +++ b/install/package.json @@ -61,7 +61,7 @@ "express-useragent": "^1.0.15", "graceful-fs": "^4.2.6", "helmet": "^4.4.1", - "html-to-text": "8.0.0", + "html-to-text": "8.1.0", "ipaddr.js": "^2.0.0", "jquery": "3.6.0", "jquery-deserialize": "2.0.0", From b736347cd329e42f85492cb6fdc90c85ea801038 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Mon, 8 Nov 2021 09:07:54 +0000 Subject: [PATCH 69/95] Latest translations and fallbacks --- public/language/bg/admin/development/info.json | 10 +++++----- public/language/fr/admin/development/info.json | 10 +++++----- public/language/it/admin/development/info.json | 10 +++++----- public/language/it/admin/settings/navigation.json | 4 ++-- public/language/vi/admin/development/info.json | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/public/language/bg/admin/development/info.json b/public/language/bg/admin/development/info.json index c03576fce6..08f70c0692 100644 --- a/public/language/bg/admin/development/info.json +++ b/public/language/bg/admin/development/info.json @@ -8,11 +8,11 @@ "nodejs": "nodejs", "online": "на линия", "git": "git", - "process-memory": "process memory", - "system-memory": "system memory", - "used-memory-process": "Used memory by process", - "used-memory-os": "Used system memory", - "total-memory-os": "Total system memory", + "process-memory": "памет на процеса", + "system-memory": "системна памет", + "used-memory-process": "Използвана памет от процеса", + "used-memory-os": "Използвана системна памет", + "total-memory-os": "Обща системна памет", "load": "натоварване на системата", "cpu-usage": "използване на процесора", "uptime": "активно време", diff --git a/public/language/fr/admin/development/info.json b/public/language/fr/admin/development/info.json index 5be9541a32..2b20a90ad6 100644 --- a/public/language/fr/admin/development/info.json +++ b/public/language/fr/admin/development/info.json @@ -8,11 +8,11 @@ "nodejs": "nodejs", "online": "en ligne", "git": "git", - "process-memory": "process memory", - "system-memory": "system memory", - "used-memory-process": "Used memory by process", - "used-memory-os": "Used system memory", - "total-memory-os": "Total system memory", + "process-memory": "mémoire de processus", + "system-memory": "mémoire système", + "used-memory-process": "Mémoire utilisée par processus", + "used-memory-os": "Mémoire système utilisée", + "total-memory-os": "Mémoire système totale", "load": "Charge du système", "cpu-usage": "Utilisation du processeur", "uptime": "disponibilité", diff --git a/public/language/it/admin/development/info.json b/public/language/it/admin/development/info.json index 174bc38169..28b9bf2831 100644 --- a/public/language/it/admin/development/info.json +++ b/public/language/it/admin/development/info.json @@ -8,11 +8,11 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "process-memory": "process memory", - "system-memory": "system memory", - "used-memory-process": "Used memory by process", - "used-memory-os": "Used system memory", - "total-memory-os": "Total system memory", + "process-memory": "memoria di processo", + "system-memory": "memoria di sistema", + "used-memory-process": "Memoria usata dal processo", + "used-memory-os": "Memoria di sistema usata", + "total-memory-os": "Memoria totale del sistema", "load": "carico sistema", "cpu-usage": "uso CPU", "uptime": "tempo di caricamento", diff --git a/public/language/it/admin/settings/navigation.json b/public/language/it/admin/settings/navigation.json index 77ba9c2f42..75607ccce6 100644 --- a/public/language/it/admin/settings/navigation.json +++ b/public/language/it/admin/settings/navigation.json @@ -11,8 +11,8 @@ "properties": "Proprietà:", "groups": "Gruppi:", "open-new-window": "Apri in una nuova finestra", - "dropdown": "Dropdown", - "dropdown-placeholder": "Place your dropdown menu items below, ie:
<li><a href="https://myforum.com">Link 1</a></li>", + "dropdown": "Menu a tendina", + "dropdown-placeholder": "Posiziona le voci del tuo menu a tendina in basso, ad esempio:
<li><a href="https://myforum.com">Link 1</a></li>", "btn.delete": "Elimina", "btn.disable": "Disabilita", diff --git a/public/language/vi/admin/development/info.json b/public/language/vi/admin/development/info.json index 8d9d08806b..4a76411c21 100644 --- a/public/language/vi/admin/development/info.json +++ b/public/language/vi/admin/development/info.json @@ -8,11 +8,11 @@ "nodejs": "nodejs", "online": "trực tuyến", "git": "git", - "process-memory": "process memory", - "system-memory": "system memory", - "used-memory-process": "Used memory by process", - "used-memory-os": "Used system memory", - "total-memory-os": "Total system memory", + "process-memory": "xử lý bộ nhớ", + "system-memory": "bộ nhớ hệ thống", + "used-memory-process": "Đã sử dụng bộ nhớ theo quy trình", + "used-memory-os": "Bộ nhớ hệ thống đã sử dụng", + "total-memory-os": "Tổng bộ nhớ hệ thống", "load": "tải hệ thống", "cpu-usage": "sử dụng cpu", "uptime": "thời gian hoạt động", From 98ebc4d9aced4f8011d004547554e5746b3d6efa Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 8 Nov 2021 10:02:38 +0000 Subject: [PATCH 70/95] fix(deps): update dependency socket.io to v4.3.2 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 4c0ee01e8d..e59766f156 100644 --- a/install/package.json +++ b/install/package.json @@ -119,7 +119,7 @@ "sharp": "0.29.2", "sitemap": "^7.0.0", "slideout": "1.0.1", - "socket.io": "4.3.1", + "socket.io": "4.3.2", "socket.io-adapter-cluster": "^1.0.1", "socket.io-client": "4.3.2", "@socket.io/redis-adapter": "7.0.0", From 1a22b0ecf2c7b08bc08551dc67a8bad702a585cb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 8 Nov 2021 15:31:38 +0000 Subject: [PATCH 71/95] fix(deps): update dependency nodebb-plugin-mentions to v3.0.2 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index e59766f156..db67e3b86b 100644 --- a/install/package.json +++ b/install/package.json @@ -89,7 +89,7 @@ "nodebb-plugin-emoji": "^3.5.0", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "8.14.4", - "nodebb-plugin-mentions": "3.0.1", + "nodebb-plugin-mentions": "3.0.2", "nodebb-plugin-spam-be-gone": "0.7.11", "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.3.1", From b912a564e379fd7eb73ff8e3a1c2c103df962464 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 8 Nov 2021 15:16:39 -0500 Subject: [PATCH 72/95] fix: accidentally not clearing email when said email is confirmed for a different uid --- src/user/email.js | 6 ++++++ test/user.js | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/user/email.js b/src/user/email.js index 85162b8414..d6d2d32b4d 100644 --- a/src/user/email.js +++ b/src/user/email.js @@ -143,6 +143,12 @@ UserEmail.confirmByCode = async function (code, sessionId) { throw new Error('[[error:invalid-data]]'); } + // If another uid has the same email, remove it + const oldUid = await db.sortedSetScore('email:uid', confirmObj.email.toLowerCase()); + if (oldUid) { + await UserEmail.remove(oldUid, sessionId); + } + const oldEmail = await user.getUserField(confirmObj.uid, 'email'); if (oldEmail && confirmObj.email !== oldEmail) { await UserEmail.remove(confirmObj.uid, sessionId); diff --git a/test/user.js b/test/user.js index e74eb8252d..671cc06d20 100644 --- a/test/user.js +++ b/test/user.js @@ -2462,6 +2462,22 @@ describe('User', () => { assert.strictEqual(parseInt(confirmed, 10), 1); assert.strictEqual(isVerified, true); }); + + it('should remove the email from a different account if the email is already in use', async () => { + const email = 'confirm2@me.com'; + const uid = await User.create({ + username: 'confirme3', + }); + + const oldUid = await db.sortedSetScore('email:uid', email); + const code = await User.email.sendValidationEmail(uid, email); + await User.email.confirmByCode(code); + + const oldUserData = await User.getUserData(oldUid); + + assert.strictEqual((await db.sortedSetScore('email:uid', email)), uid); + assert.strictEqual(oldUserData.email, ''); + }); }); describe('user jobs', () => { From c1ac29128494df9b8ad9e1d25166ce340eed8014 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 8 Nov 2021 15:36:37 -0500 Subject: [PATCH 73/95] fix: ability to enumerate email via updateProfile method --- src/user/profile.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/user/profile.js b/src/user/profile.js index 2748690b81..a8d1b02d1d 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -71,7 +71,7 @@ module.exports = function (User) { }; async function validateData(callerUid, data) { - await isEmailAvailable(data, data.uid); + await isEmailValid(data); await isUsernameAvailable(data, data.uid); await isWebsiteValid(callerUid, data); await isAboutMeValid(callerUid, data); @@ -82,7 +82,7 @@ module.exports = function (User) { isGroupTitleValid(data); } - async function isEmailAvailable(data, uid) { + async function isEmailValid(data) { if (!data.email) { return; } @@ -91,14 +91,6 @@ module.exports = function (User) { if (!utils.isEmailValid(data.email)) { throw new Error('[[error:invalid-email]]'); } - const email = await User.getUserField(uid, 'email'); - if (email === data.email) { - return; - } - const available = await User.email.available(data.email); - if (!available) { - throw new Error('[[error:email-taken]]'); - } } async function isUsernameAvailable(data, uid) { From 0a7ff2085e63a5c26b491e2802a52f105ed761dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 8 Nov 2021 16:55:25 -0500 Subject: [PATCH 74/95] refactor: remove jshint --- .jsbeautifyrc | 17 ---------- .jshintrc | 91 --------------------------------------------------- 2 files changed, 108 deletions(-) delete mode 100644 .jsbeautifyrc delete mode 100644 .jshintrc diff --git a/.jsbeautifyrc b/.jsbeautifyrc deleted file mode 100644 index d76e93f2d5..0000000000 --- a/.jsbeautifyrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "indent_size": 4, - "indent_char": " ", - "indent_level": 0, - "indent_with_tabs": true, - "preserve_newlines": true, - "max_preserve_newlines": 10, - "jslint_happy": true, - "brace_style": "collapse", - "keep_array_indentation": false, - "keep_function_indentation": false, - "space_before_conditional": true, - "break_chained_methods": false, - "eval_code": false, - "unescape_strings": false, - "wrap_line_length": 0 -} \ No newline at end of file diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 37c22ddcf9..0000000000 --- a/.jshintrc +++ /dev/null @@ -1,91 +0,0 @@ -{ - // JSHint Default Configuration File (as on JSHint website) - // See http://jshint.com/docs/ for more details - - "maxerr" : 50, // {int} Maximum error before stopping - - "esversion": 9, - - // Enforcing - "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.) - "camelcase" : false, // true: Identifiers must be in camelCase - "curly" : true, // true: Require {} for every new block or scope - "eqeqeq" : true, // true: Require triple equals (===) for comparison - "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty() - "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());` - "indent" : 4, // {int} Number of spaces to use for indentation - "latedef" : false, // true: Require variables/functions to be defined before being used - "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()` - "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee` - "noempty" : true, // true: Prohibit use of empty blocks - "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment) - "plusplus" : false, // true: Prohibit use of `++` & `--` - "quotmark" : false, // Quotation mark consistency: - // false : do nothing (default) - // true : ensure whatever is used is consistent - // "single" : require single quotes - // "double" : require double quotes - "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks) - "unused" : true, // true: Require all defined variables be used - "strict" : true, // true: Requires all functions run in ES5 Strict Mode - "trailing" : false, // true: Prohibit trailing whitespaces - "maxparams" : false, // {int} Max number of formal params allowed per function - "maxdepth" : false, // {int} Max depth of nested blocks (within functions) - "maxstatements" : false, // {int} Max number statements per function - "maxcomplexity" : false, // {int} Max cyclomatic complexity per function - "maxlen" : false, // {int} Max number of characters per line - - // Relaxing - "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons) - "boss" : false, // true: Tolerate assignments where comparisons would be expected - "debug" : false, // true: Allow debugger statements e.g. browser breakpoints. - "eqnull" : false, // true: Tolerate use of `== null` - "es5" : false, // true: Allow ES5 syntax (ex: getters and setters) - "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`) - "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features) - // (ex: `for each`, multiple try/catch, function expression…) - "evil" : false, // true: Tolerate use of `eval` and `new Function()` - "expr" : false, // true: Tolerate `ExpressionStatement` as Programs - "funcscope" : false, // true: Tolerate defining variables inside control statements" - "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict') - "iterator" : false, // true: Tolerate using the `__iterator__` property - "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block - "laxbreak" : false, // true: Tolerate possibly unsafe line breakings - "laxcomma" : false, // true: Tolerate comma-first style coding - "loopfunc" : false, // true: Tolerate functions being defined in loops - "multistr" : false, // true: Tolerate multi-line strings - "proto" : false, // true: Tolerate using the `__proto__` property - "scripturl" : false, // true: Tolerate script-targeted URLs - "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment - "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;` - "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation - "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;` - "validthis" : false, // true: Tolerate using this in a non-constructor function - - // Environments - "browser" : true, // Web Browser (window, document, etc) - "couch" : false, // CouchDB - "devel" : true, // Development/debugging (alert, confirm, etc) - "dojo" : false, // Dojo Toolkit - "jquery" : true, // jQuery - "mootools" : false, // MooTools - "node" : true, // Node.js - "nonstandard" : false, // Widely adopted globals (escape, unescape, etc) - "prototypejs" : false, // Prototype and Scriptaculous - "rhino" : false, // Rhino - "worker" : false, // Web Workers - "wsh" : false, // Windows Scripting Host - "yui" : false, // Yahoo User Interface - "mocha": true, - - // Legacy - "nomen" : false, // true: Prohibit dangling `_` in variables - "onevar" : false, // true: Allow only one `var` statement per function - "passfail" : false, // true: Stop on first error - "white" : false, // true: Check against strict whitespace and indentation rules - - // Custom Globals - "globals" : { - "Promise": true - } // additional predefined global variables -} \ No newline at end of file From 518552543d2f0b322235ca83c3f1c96a947f11b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 8 Nov 2021 20:40:41 -0500 Subject: [PATCH 75/95] refactor: move warnings/messages out of app.js --- public/src/app.js | 132 +--------------------------- public/src/client/chats/messages.js | 6 +- public/src/modules/messages.js | 100 +++++++++++++++++++++ src/meta/js.js | 1 + 4 files changed, 109 insertions(+), 130 deletions(-) create mode 100644 public/src/modules/messages.js diff --git a/public/src/app.js b/public/src/app.js index e6f3e95e1c..86cc0bc11d 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -11,9 +11,6 @@ app.cacheBuster = null; (function () { let appLoaded = false; - const params = utils.params(); - let showWelcomeMessage = !!params.loggedin; - let registerMessage = params.register; const isTouchDevice = utils.isTouchDevice(); app.cacheBuster = config['cache-buster']; @@ -97,8 +94,7 @@ app.cacheBuster = null; }); createHeaderTooltips(); - app.showEmailConfirmWarning(); - app.showCookieWarning(); + registerServiceWorker(); require([ @@ -106,11 +102,12 @@ app.cacheBuster = null; 'helpers', 'forum/pagination', 'translator', + 'messages', 'forum/unread', 'forum/header/notifications', 'forum/header/chat', 'timeago/jquery.timeago', - ], function (taskbar, helpers, pagination, translator, unread, notifications, chat) { + ], function (taskbar, helpers, pagination, translator, messages, unread, notifications, chat) { notifications.prepareDOM(); chat.prepareDOM(); translator.prepareDOM(); @@ -123,7 +120,7 @@ app.cacheBuster = null; } function finishLoad() { hooks.fire('action:app.load'); - app.showMessages(); + messages.show(); appLoaded = true; } overrides.overrideTimeago(); @@ -332,54 +329,6 @@ app.cacheBuster = null; app.createStatusTooltips(); }; - app.showMessages = function () { - const messages = { - login: { - format: 'alert', - title: '[[global:welcome_back]] ' + app.user.username + '!', - message: '[[global:you_have_successfully_logged_in]]', - }, - register: { - format: 'modal', - }, - }; - - function showAlert(type, message) { - switch (messages[type].format) { - case 'alert': - app.alert({ - type: 'success', - title: messages[type].title, - message: messages[type].message, - timeout: 5000, - }); - break; - - case 'modal': - require(['bootbox'], function (bootbox) { - bootbox.alert({ - title: messages[type].title, - message: message || messages[type].message, - }); - }); - break; - } - } - - if (showWelcomeMessage) { - showWelcomeMessage = false; - $(document).ready(function () { - showAlert('login'); - }); - } - if (registerMessage) { - $(document).ready(function () { - showAlert('register', utils.escapeHTML(decodeURIComponent(registerMessage))); - registerMessage = false; - }); - } - }; - app.openChat = function (roomId, uid) { if (!app.user.uid) { return app.alertError('[[error:not-logged-in]]'); @@ -758,46 +707,6 @@ app.cacheBuster = null; }); }; - app.showEmailConfirmWarning = async (err) => { - const storage = await app.require('storage'); - - if (!config.emailPrompt || !app.user.uid || parseInt(storage.getItem('email-confirm-dismiss'), 10) === 1) { - return; - } - const msg = { - alert_id: 'email_confirm', - type: 'warning', - timeout: 0, - closefn: () => { - storage.setItem('email-confirm-dismiss', 1); - }, - }; - - if (!app.user.email) { - msg.message = '[[error:no-email-to-confirm]]'; - msg.clickfn = function () { - app.removeAlert('email_confirm'); - ajaxify.go('user/' + app.user.userslug + '/edit/email'); - }; - app.alert(msg); - } else if (!app.user['email:confirmed'] && !app.user.isEmailConfirmSent) { - msg.message = err ? err.message : '[[error:email-not-confirmed]]'; - msg.clickfn = function () { - app.removeAlert('email_confirm'); - socket.emit('user.emailConfirm', {}, function (err) { - if (err) { - return app.alertError(err.message); - } - app.alertSuccess('[[notifications:email-confirm-sent]]'); - }); - }; - app.alert(msg); - } else if (!app.user['email:confirmed'] && app.user.isEmailConfirmSent) { - msg.message = '[[error:email-not-confirmed-email-sent]]'; - app.alert(msg); - } - }; - app.parseAndTranslate = function (template, blockName, data, callback) { if (typeof blockName !== 'string') { callback = data; @@ -822,39 +731,6 @@ app.cacheBuster = null; }); }; - app.showCookieWarning = function () { - require(['translator', 'storage'], function (translator, storage) { - if (!config.cookies.enabled || !navigator.cookieEnabled) { - // Skip warning if cookie consent subsystem disabled (obviously), or cookies not in use - return; - } else if (window.location.pathname.startsWith(config.relative_path + '/admin')) { - // No need to show cookie consent warning in ACP - return; - } else if (storage.getItem('cookieconsent') === '1') { - return; - } - - config.cookies.message = translator.unescape(config.cookies.message); - config.cookies.dismiss = translator.unescape(config.cookies.dismiss); - config.cookies.link = translator.unescape(config.cookies.link); - config.cookies.link_url = translator.unescape(config.cookies.link_url); - - app.parseAndTranslate('partials/cookie-consent', config.cookies, function (html) { - $(document.body).append(html); - $(document.body).addClass('cookie-consent-open'); - - const warningEl = $('.cookie-consent'); - const dismissEl = warningEl.find('button'); - dismissEl.on('click', function () { - // Save consent cookie and remove warning element - storage.setItem('cookieconsent', '1'); - warningEl.remove(); - $(document.body).removeClass('cookie-consent-open'); - }); - }); - }); - }; - function registerServiceWorker() { // Do not register for Safari browsers if (!ajaxify.data._locals.useragent.isSafari && 'serviceWorker' in navigator) { diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.js index 5d43497014..540edcae67 100644 --- a/public/src/client/chats/messages.js +++ b/public/src/client/chats/messages.js @@ -1,7 +1,9 @@ 'use strict'; -define('forum/chats/messages', ['components', 'translator', 'benchpress', 'hooks', 'bootbox'], function (components, translator, Benchpress, hooks, bootbox) { +define('forum/chats/messages', [ + 'components', 'translator', 'benchpress', 'hooks', 'bootbox', 'messages' +], function (components, translator, Benchpress, hooks, bootbox, messagesModule) { const messages = {}; messages.sendMessage = function (roomId, inputEl) { @@ -30,7 +32,7 @@ define('forum/chats/messages', ['components', 'translator', 'benchpress', 'hooks inputEl.val(msg); messages.updateRemainingLength(inputEl.parent()); if (err.message === '[[error:email-not-confirmed-chat]]') { - return app.showEmailConfirmWarning(err); + return messagesModule.showEmailConfirmWarning(err.message); } return app.alert({ diff --git a/public/src/modules/messages.js b/public/src/modules/messages.js new file mode 100644 index 0000000000..ad8992a893 --- /dev/null +++ b/public/src/modules/messages.js @@ -0,0 +1,100 @@ +'use strict'; + +define('messages', ['bootbox', 'translator', 'storage'], function (bootbox, translator, storage) { + const messages = {}; + + let showWelcomeMessage; + let registerMessage; + + messages.show = function () { + showQueryStringMessages(); + showCookieWarning(); + messages.showEmailConfirmWarning(); + }; + + messages.showEmailConfirmWarning = function (message) { + if (!config.emailPrompt || !app.user.uid || parseInt(storage.getItem('email-confirm-dismiss'), 10) === 1) { + return; + } + const msg = { + alert_id: 'email_confirm', + type: 'warning', + timeout: 0, + closefn: () => { + storage.setItem('email-confirm-dismiss', 1); + }, + }; + + if (!app.user.email) { + msg.message = '[[error:no-email-to-confirm]]'; + msg.clickfn = function () { + app.removeAlert('email_confirm'); + ajaxify.go('user/' + app.user.userslug + '/edit/email'); + }; + app.alert(msg); + } else if (!app.user['email:confirmed'] && !app.user.isEmailConfirmSent) { + msg.message = message || '[[error:email-not-confirmed]]'; + msg.clickfn = function () { + app.removeAlert('email_confirm'); + socket.emit('user.emailConfirm', {}, function (err) { + if (err) { + return app.alertError(err.message); + } + app.alertSuccess('[[notifications:email-confirm-sent]]'); + }); + }; + app.alert(msg); + } else if (!app.user['email:confirmed'] && app.user.isEmailConfirmSent) { + msg.message = '[[error:email-not-confirmed-email-sent]]'; + app.alert(msg); + } + }; + + function showCookieWarning() { + if (!config.cookies.enabled || !navigator.cookieEnabled || app.inAdmin || storage.getItem('cookieconsent') === '1') { + return; + } + + config.cookies.message = translator.unescape(config.cookies.message); + config.cookies.dismiss = translator.unescape(config.cookies.dismiss); + config.cookies.link = translator.unescape(config.cookies.link); + config.cookies.link_url = translator.unescape(config.cookies.link_url); + + app.parseAndTranslate('partials/cookie-consent', config.cookies, function (html) { + $(document.body).append(html); + $(document.body).addClass('cookie-consent-open'); + + const warningEl = $('.cookie-consent'); + const dismissEl = warningEl.find('button'); + dismissEl.on('click', function () { + // Save consent cookie and remove warning element + storage.setItem('cookieconsent', '1'); + warningEl.remove(); + $(document.body).removeClass('cookie-consent-open'); + }); + }); + } + + function showQueryStringMessages() { + const params = utils.params(); + showWelcomeMessage = !!params.loggedin; + registerMessage = params.register; + + if (showWelcomeMessage) { + app.alert({ + type: 'success', + title: '[[global:welcome_back]] ' + app.user.username + '!', + message: '[[global:you_have_successfully_logged_in]]', + timeout: 5000, + }); + } + + if (registerMessage) { + bootbox.alert({ + message: utils.escapeHTML(decodeURIComponent(registerMessage)), + }); + } + } + + return messages; +}); diff --git a/src/meta/js.js b/src/meta/js.js index 8e712ccf15..7d5fc7fb42 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -74,6 +74,7 @@ JS.scripts = { 'public/src/modules/helpers.js', 'public/src/modules/storage.js', 'public/src/modules/handleBack.js', + 'public/src/modules/messages.js', ], admin: [ From 3d2398ac4c6011c777229bf211919bf77bba29f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 8 Nov 2021 20:48:32 -0500 Subject: [PATCH 76/95] test: lint --- public/src/client/chats/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.js index 540edcae67..7c11c1a479 100644 --- a/public/src/client/chats/messages.js +++ b/public/src/client/chats/messages.js @@ -2,7 +2,7 @@ define('forum/chats/messages', [ - 'components', 'translator', 'benchpress', 'hooks', 'bootbox', 'messages' + 'components', 'translator', 'benchpress', 'hooks', 'bootbox', 'messages', ], function (components, translator, Benchpress, hooks, bootbox, messagesModule) { const messages = {}; From 666fe209f05e1a2fa9a4b4f553268a9a93527cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 8 Nov 2021 21:00:37 -0500 Subject: [PATCH 77/95] refactor: move session messages --- public/src/app.js | 33 --------------------------------- public/src/modules/messages.js | 26 ++++++++++++++++++++++++-- public/src/sockets.js | 23 +++++++++++++++++++++-- 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 86cc0bc11d..d6f34dc2d3 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -212,39 +212,6 @@ app.cacheBuster = null; }); }; - app.handleInvalidSession = function () { - socket.disconnect(); - app.logout(false); - require(['bootbox'], function (bootbox) { - bootbox.alert({ - title: '[[error:invalid-session]]', - message: '[[error:invalid-session-text]]', - closeButton: false, - callback: function () { - window.location.reload(); - }, - }); - }); - }; - - app.handleSessionMismatch = () => { - if (app.flags._login || app.flags._logout) { - return; - } - - socket.disconnect(); - require(['bootbox'], function (bootbox) { - bootbox.alert({ - title: '[[error:session-mismatch]]', - message: '[[error:session-mismatch-text]]', - closeButton: false, - callback: function () { - window.location.reload(); - }, - }); - }); - }; - app.enterRoom = function (room, callback) { callback = callback || function () { }; if (socket && app.user.uid && app.currentRoom !== room) { diff --git a/public/src/modules/messages.js b/public/src/modules/messages.js index ad8992a893..0c1cfe2e71 100644 --- a/public/src/modules/messages.js +++ b/public/src/modules/messages.js @@ -1,6 +1,6 @@ 'use strict'; -define('messages', ['bootbox', 'translator', 'storage'], function (bootbox, translator, storage) { +define('messages', ['bootbox', 'translator', 'storage', 'alerts'], function (bootbox, translator, storage, alerts) { const messages = {}; let showWelcomeMessage; @@ -81,7 +81,7 @@ define('messages', ['bootbox', 'translator', 'storage'], function (bootbox, tran registerMessage = params.register; if (showWelcomeMessage) { - app.alert({ + alerts.alert({ type: 'success', title: '[[global:welcome_back]] ' + app.user.username + '!', message: '[[global:you_have_successfully_logged_in]]', @@ -96,5 +96,27 @@ define('messages', ['bootbox', 'translator', 'storage'], function (bootbox, tran } } + messages.showInvalidSession = function () { + bootbox.alert({ + title: '[[error:invalid-session]]', + message: '[[error:invalid-session-text]]', + closeButton: false, + callback: function () { + window.location.reload(); + }, + }); + }; + + messages.showSessionMismatch = function () { + bootbox.alert({ + title: '[[error:session-mismatch]]', + message: '[[error:session-mismatch-text]]', + closeButton: false, + callback: function () { + window.location.reload(); + }, + }); + }; + return messages; }); diff --git a/public/src/sockets.js b/public/src/sockets.js index 7615fe5b2b..c4763b28d5 100644 --- a/public/src/sockets.js +++ b/public/src/sockets.js @@ -80,11 +80,11 @@ socket = window.socket; socket.on('checkSession', function (uid) { if (parseInt(uid, 10) !== parseInt(app.user.uid, 10)) { - app.handleSessionMismatch(); + handleSessionMismatch(); } }); socket.on('event:invalid_session', () => { - app.handleInvalidSession(); + handleInvalidSession(); }); socket.on('setHostname', function (hostname) { @@ -126,6 +126,25 @@ socket = window.socket; }); } + function handleInvalidSession() { + socket.disconnect(); + app.logout(false); + require(['messages'], function (messages) { + messages.showInvalidSession(); + }); + } + + function handleSessionMismatch() { + if (app.flags._login || app.flags._logout) { + return; + } + + socket.disconnect(); + require(['messages'], function (messages) { + messages.showSessionMismatch(); + }); + } + function onConnect() { if (!reconnecting) { hooks.fire('action:connected'); From 1a9b15989b655fcf0d18e8c396957fe509eab701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 8 Nov 2021 21:31:49 -0500 Subject: [PATCH 78/95] refactor: move search functions from app.js to search module deprecate: app.handleSearch, use search.init(options) instead app.enableTopicSearch, use search.enableQuickSearch(options) instead app.prepareSearch, use search.showAndFocusInput() instead --- public/src/app.js | 222 ++----------------------------- public/src/client/topic.js | 4 +- public/src/client/topic/merge.js | 4 +- public/src/modules/search.js | 212 ++++++++++++++++++++++++++++- src/meta/js.js | 1 + 5 files changed, 228 insertions(+), 215 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index d6f34dc2d3..3374f1b68c 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -75,10 +75,6 @@ app.cacheBuster = null; app.load = function () { handleStatusChange(); - if (config.searchEnabled) { - app.handleSearch(); - } - $('body').on('click', '#new_topic', function (e) { e.preventDefault(); app.newTopic(); @@ -103,17 +99,19 @@ app.cacheBuster = null; 'forum/pagination', 'translator', 'messages', + 'search', 'forum/unread', 'forum/header/notifications', 'forum/header/chat', 'timeago/jquery.timeago', - ], function (taskbar, helpers, pagination, translator, messages, unread, notifications, chat) { + ], function (taskbar, helpers, pagination, translator, messages, search, unread, notifications, chat) { notifications.prepareDOM(); chat.prepareDOM(); translator.prepareDOM(); taskbar.init(); helpers.register(); pagination.init(); + search.init(); if (app.user.uid > 0) { unread.initUnreadTopics(); @@ -404,218 +402,24 @@ app.cacheBuster = null; } app.enableTopicSearch = function (options) { - if (!config.searchEnabled || !app.user.privileges['search:content']) { - return; - } - /* eslint-disable-next-line */ - const searchOptions = Object.assign({ in: config.searchDefaultInQuick || 'titles' }, options.searchOptions); - const quickSearchResults = options.searchElements.resultEl; - const inputEl = options.searchElements.inputEl; - let oldValue = inputEl.val(); - const filterCategoryEl = quickSearchResults.find('.filter-category'); - - function updateCategoryFilterName() { - if (ajaxify.data.template.category) { - require(['translator'], function (translator) { - translator.translate('[[search:search-in-category, ' + ajaxify.data.name + ']]', function (translated) { - const name = $('
').html(translated).text(); - filterCategoryEl.find('.name').text(name); - }); - }); - } - filterCategoryEl.toggleClass('hidden', !ajaxify.data.template.category); - } - - function doSearch() { - require(['search'], function (search) { - /* eslint-disable-next-line */ - options.searchOptions = Object.assign({}, searchOptions); - options.searchOptions.term = inputEl.val(); - updateCategoryFilterName(); - - if (ajaxify.data.template.category) { - if (filterCategoryEl.find('input[type="checkbox"]').is(':checked')) { - options.searchOptions.categories = [ajaxify.data.cid]; - options.searchOptions.searchChildren = true; - } - } - - quickSearchResults.removeClass('hidden').find('.quick-search-results-container').html(''); - quickSearchResults.find('.loading-indicator').removeClass('hidden'); - hooks.fire('action:search.quick.start', options); - options.searchOptions.searchOnly = 1; - search.api(options.searchOptions, function (data) { - quickSearchResults.find('.loading-indicator').addClass('hidden'); - if (options.hideOnNoMatches && !data.posts.length) { - return quickSearchResults.addClass('hidden').find('.quick-search-results-container').html(''); - } - data.posts.forEach(function (p) { - const text = $('
' + p.content + '
').text(); - const query = inputEl.val().toLowerCase().replace(/^in:topic-\d+/, ''); - const start = Math.max(0, text.toLowerCase().indexOf(query) - 40); - p.snippet = utils.escapeHTML((start > 0 ? '...' : '') + - text.slice(start, start + 80) + - (text.length - start > 80 ? '...' : '')); - }); - app.parseAndTranslate('partials/quick-search-results', data, function (html) { - if (html.length) { - html.find('.timeago').timeago(); - } - quickSearchResults.toggleClass('hidden', !html.length || !inputEl.is(':focus')) - .find('.quick-search-results-container') - .html(html.length ? html : ''); - const highlightEls = quickSearchResults.find( - '.quick-search-results .quick-search-title, .quick-search-results .snippet' - ); - search.highlightMatches(options.searchOptions.term, highlightEls); - hooks.fire('action:search.quick.complete', { - data: data, - options: options, - }); - }); - }); - }); - } - - quickSearchResults.find('.filter-category input[type="checkbox"]').on('change', function () { - inputEl.focus(); - doSearch(); - }); - - inputEl.off('keyup').on('keyup', utils.debounce(function () { - if (inputEl.val().length < 3) { - quickSearchResults.addClass('hidden'); - oldValue = inputEl.val(); - return; - } - if (inputEl.val() === oldValue) { - return; - } - oldValue = inputEl.val(); - if (!inputEl.is(':focus')) { - return quickSearchResults.addClass('hidden'); - } - doSearch(); - }, 500)); - - let mousedownOnResults = false; - quickSearchResults.on('mousedown', function () { - $(window).one('mouseup', function () { - quickSearchResults.addClass('hidden'); - }); - mousedownOnResults = true; - }); - inputEl.on('blur', function () { - if (!inputEl.is(':focus') && !mousedownOnResults && !quickSearchResults.hasClass('hidden')) { - quickSearchResults.addClass('hidden'); - } - }); - - let ajaxified = false; - require(['hooks'], function (hooks) { - hooks.on('action:ajaxify.end', function () { - if (!ajaxify.isCold()) { - ajaxified = true; - } - }); - }); - - inputEl.on('focus', function () { - mousedownOnResults = false; - const query = inputEl.val(); - oldValue = query; - if (query && quickSearchResults.find('#quick-search-results').children().length) { - updateCategoryFilterName(); - if (ajaxified) { - doSearch(); - ajaxified = false; - } else { - quickSearchResults.removeClass('hidden'); - } - inputEl[0].setSelectionRange( - query.startsWith('in:topic') ? query.indexOf(' ') + 1 : 0, - query.length - ); - } - }); - - inputEl.off('refresh').on('refresh', function () { - doSearch(); + console.warn('[deprecated] app.enableTopicSearch is deprecated, please use search.enableQuickSearch(options)'); + require(['search'], function (search) { + search.enableQuickSearch(options); }); }; app.handleSearch = function (searchOptions) { - searchOptions = searchOptions || { in: config.searchDefaultInQuick || 'titles' }; - const searchButton = $('#search-button'); - const searchFields = $('#search-fields'); - const searchInput = $('#search-fields input'); - const quickSearchContainer = $('#quick-search-container'); - - $('#search-form .advanced-search-link').off('mousedown').on('mousedown', function () { - ajaxify.go('/search'); - }); - - $('#search-form').off('submit').on('submit', function () { - searchInput.blur(); - }); - searchInput.off('blur').on('blur', dismissSearch); - searchInput.off('focus'); - - const searchElements = { - inputEl: searchInput, - resultEl: quickSearchContainer, - }; - - app.enableTopicSearch({ - searchOptions: searchOptions, - searchElements: searchElements, - }); - - function dismissSearch() { - setTimeout(function () { - if (!searchInput.is(':focus')) { - searchFields.addClass('hidden'); - searchButton.removeClass('hidden'); - } - }, 200); - } - - searchButton.off('click').on('click', function (e) { - if (!config.loggedIn && !app.user.privileges['search:content']) { - app.alert({ - message: '[[error:search-requires-login]]', - timeout: 3000, - }); - ajaxify.go('login'); - return false; - } - e.stopPropagation(); - - app.prepareSearch(); - return false; - }); - - $('#search-form').off('submit').on('submit', function () { - const input = $(this).find('input'); - require(['search'], function (search) { - const data = search.getSearchPreferences(); - data.term = input.val(); - hooks.fire('action:search.submit', { - searchOptions: data, - searchElements: searchElements, - }); - search.query(data, function () { - input.val(''); - }); - }); - return false; + console.warn('[deprecated] app.handleSearch is deprecated, please use search.init(options)'); + require(['search'], function (search) { + search.init(searchOptions); }); }; app.prepareSearch = function () { - $('#search-fields').removeClass('hidden'); - $('#search-button').addClass('hidden'); - $('#search-fields input').focus(); + console.warn('[deprecated] app.prepareSearch is deprecated, please use search.showAndFocusInput()'); + require(['search'], function (search) { + search.showAndFocusInput(); + }); }; function handleStatusChange() { diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 03bdeb0736..47dfdba236 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -69,12 +69,12 @@ define('forum/topic', [ function handleTopicSearch() { if (config.topicSearchEnabled) { - require(['mousetrap'], function (mousetrap) { + 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 + ' '); - app.prepareSearch(); + search.showAndFocusInput(); } }); }); diff --git a/public/src/client/topic/merge.js b/public/src/client/topic/merge.js index ba716d0738..4264838786 100644 --- a/public/src/client/topic/merge.js +++ b/public/src/client/topic/merge.js @@ -1,7 +1,7 @@ 'use strict'; -define('forum/topic/merge', function () { +define('forum/topic/merge', ['search'], function (search) { const Merge = {}; let modal; let mergeBtn; @@ -30,7 +30,7 @@ define('forum/topic/merge', function () { mergeTopics(mergeBtn); }); - app.enableTopicSearch({ + search.enableQuickSearch({ searchElements: { inputEl: modal.find('.topic-search-input'), resultEl: modal.find('.quick-search-container'), diff --git a/public/src/modules/search.js b/public/src/modules/search.js index cd53fac2e9..1249435c69 100644 --- a/public/src/modules/search.js +++ b/public/src/modules/search.js @@ -1,11 +1,219 @@ 'use strict'; - -define('search', ['navigator', 'translator', 'storage', 'hooks'], function (nav, translator, storage, hooks) { +define('search', ['translator', 'storage', 'hooks'], function (translator, storage, hooks) { const Search = { current: {}, }; + Search.init = function (searchOptions) { + if (!config.searchEnabled) { + return; + } + + searchOptions = searchOptions || { in: config.searchDefaultInQuick || 'titles' }; + const searchButton = $('#search-button'); + const searchFields = $('#search-fields'); + const searchInput = $('#search-fields input'); + const quickSearchContainer = $('#quick-search-container'); + + $('#search-form .advanced-search-link').off('mousedown').on('mousedown', function () { + ajaxify.go('/search'); + }); + + $('#search-form').off('submit').on('submit', function () { + searchInput.blur(); + }); + searchInput.off('blur').on('blur', function dismissSearch() { + setTimeout(function () { + if (!searchInput.is(':focus')) { + searchFields.addClass('hidden'); + searchButton.removeClass('hidden'); + } + }, 200); + }); + searchInput.off('focus'); + + const searchElements = { + inputEl: searchInput, + resultEl: quickSearchContainer, + }; + + Search.enableQuickSearch({ + searchOptions: searchOptions, + searchElements: searchElements, + }); + + searchButton.off('click').on('click', function (e) { + if (!config.loggedIn && !app.user.privileges['search:content']) { + app.alert({ + message: '[[error:search-requires-login]]', + timeout: 3000, + }); + ajaxify.go('login'); + return false; + } + e.stopPropagation(); + + Search.showAndFocusInput(); + return false; + }); + + $('#search-form').off('submit').on('submit', function () { + const input = $(this).find('input'); + const data = Search.getSearchPreferences(); + data.term = input.val(); + hooks.fire('action:search.submit', { + searchOptions: data, + searchElements: searchElements, + }); + Search.query(data, function () { + input.val(''); + }); + + return false; + }); + }; + + Search.enableQuickSearch = function (options) { + if (!config.searchEnabled || !app.user.privileges['search:content']) { + return; + } + + const searchOptions = Object.assign({ in: config.searchDefaultInQuick || 'titles' }, options.searchOptions); + const quickSearchResults = options.searchElements.resultEl; + const inputEl = options.searchElements.inputEl; + let oldValue = inputEl.val(); + const filterCategoryEl = quickSearchResults.find('.filter-category'); + + function updateCategoryFilterName() { + if (ajaxify.data.template.category) { + translator.translate('[[search:search-in-category, ' + ajaxify.data.name + ']]', function (translated) { + const name = $('
').html(translated).text(); + filterCategoryEl.find('.name').text(name); + }); + } + filterCategoryEl.toggleClass('hidden', !ajaxify.data.template.category); + } + + function doSearch() { + options.searchOptions = Object.assign({}, searchOptions); + options.searchOptions.term = inputEl.val(); + updateCategoryFilterName(); + + if (ajaxify.data.template.category) { + if (filterCategoryEl.find('input[type="checkbox"]').is(':checked')) { + options.searchOptions.categories = [ajaxify.data.cid]; + options.searchOptions.searchChildren = true; + } + } + + quickSearchResults.removeClass('hidden').find('.quick-search-results-container').html(''); + quickSearchResults.find('.loading-indicator').removeClass('hidden'); + hooks.fire('action:search.quick.start', options); + options.searchOptions.searchOnly = 1; + Search.api(options.searchOptions, function (data) { + quickSearchResults.find('.loading-indicator').addClass('hidden'); + if (options.hideOnNoMatches && !data.posts.length) { + return quickSearchResults.addClass('hidden').find('.quick-search-results-container').html(''); + } + data.posts.forEach(function (p) { + const text = $('
' + p.content + '
').text(); + const query = inputEl.val().toLowerCase().replace(/^in:topic-\d+/, ''); + const start = Math.max(0, text.toLowerCase().indexOf(query) - 40); + p.snippet = utils.escapeHTML((start > 0 ? '...' : '') + + text.slice(start, start + 80) + + (text.length - start > 80 ? '...' : '')); + }); + app.parseAndTranslate('partials/quick-search-results', data, function (html) { + if (html.length) { + html.find('.timeago').timeago(); + } + quickSearchResults.toggleClass('hidden', !html.length || !inputEl.is(':focus')) + .find('.quick-search-results-container') + .html(html.length ? html : ''); + const highlightEls = quickSearchResults.find( + '.quick-search-results .quick-search-title, .quick-search-results .snippet' + ); + Search.highlightMatches(options.searchOptions.term, highlightEls); + hooks.fire('action:search.quick.complete', { + data: data, + options: options, + }); + }); + }); + } + + quickSearchResults.find('.filter-category input[type="checkbox"]').on('change', function () { + inputEl.focus(); + doSearch(); + }); + + inputEl.off('keyup').on('keyup', utils.debounce(function () { + if (inputEl.val().length < 3) { + quickSearchResults.addClass('hidden'); + oldValue = inputEl.val(); + return; + } + if (inputEl.val() === oldValue) { + return; + } + oldValue = inputEl.val(); + if (!inputEl.is(':focus')) { + return quickSearchResults.addClass('hidden'); + } + doSearch(); + }, 500)); + + let mousedownOnResults = false; + quickSearchResults.on('mousedown', function () { + $(window).one('mouseup', function () { + quickSearchResults.addClass('hidden'); + }); + mousedownOnResults = true; + }); + inputEl.on('blur', function () { + if (!inputEl.is(':focus') && !mousedownOnResults && !quickSearchResults.hasClass('hidden')) { + quickSearchResults.addClass('hidden'); + } + }); + + let ajaxified = false; + hooks.on('action:ajaxify.end', function () { + if (!ajaxify.isCold()) { + ajaxified = true; + } + }); + + inputEl.on('focus', function () { + mousedownOnResults = false; + const query = inputEl.val(); + oldValue = query; + if (query && quickSearchResults.find('#quick-search-results').children().length) { + updateCategoryFilterName(); + if (ajaxified) { + doSearch(); + ajaxified = false; + } else { + quickSearchResults.removeClass('hidden'); + } + inputEl[0].setSelectionRange( + query.startsWith('in:topic') ? query.indexOf(' ') + 1 : 0, + query.length + ); + } + }); + + inputEl.off('refresh').on('refresh', function () { + doSearch(); + }); + }; + + Search.showAndFocusInput = function () { + $('#search-fields').removeClass('hidden'); + $('#search-button').addClass('hidden'); + $('#search-fields input').focus(); + }; + Search.query = function (data, callback) { callback = callback || function () {}; ajaxify.go('search?' + createQueryString(data)); diff --git a/src/meta/js.js b/src/meta/js.js index 7d5fc7fb42..742d27d61d 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -75,6 +75,7 @@ JS.scripts = { 'public/src/modules/storage.js', 'public/src/modules/handleBack.js', 'public/src/modules/messages.js', + 'public/src/modules/search.js', ], admin: [ From f352be63dc5ea89f2e8bd0b9591e7b88c49e05df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 8 Nov 2021 22:20:41 -0500 Subject: [PATCH 79/95] refactor: deprecate app.openChat/newChat use chat.openChat/newChat instead --- public/src/app.js | 68 ++--------------------- public/src/client/account/header.js | 24 ++++----- public/src/client/chats.js | 25 ++++----- public/src/client/chats/search.js | 4 +- public/src/client/flags/detail.js | 8 ++- public/src/client/topic/postTools.js | 5 +- public/src/modules/chat.js | 80 +++++++++++++++++++++++++--- 7 files changed, 112 insertions(+), 102 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 3374f1b68c..222a2fa6e1 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -295,74 +295,16 @@ app.cacheBuster = null; }; app.openChat = function (roomId, uid) { - if (!app.user.uid) { - return app.alertError('[[error:not-logged-in]]'); - } - + console.warn('[deprecated] app.openChat is deprecated, please use chat.openChat'); require(['chat'], function (chat) { - function loadAndCenter(chatModal) { - chat.load(chatModal.attr('data-uuid')); - chat.center(chatModal); - chat.focusInput(chatModal); - } - - if (chat.modalExists(roomId)) { - loadAndCenter(chat.getModal(roomId)); - } else { - socket.emit('modules.chats.loadRoom', { roomId: roomId, uid: uid || app.user.uid }, function (err, roomData) { - if (err) { - return app.alertError(err.message); - } - roomData.users = roomData.users.filter(function (user) { - return user && parseInt(user.uid, 10) !== parseInt(app.user.uid, 10); - }); - roomData.uid = uid || app.user.uid; - roomData.isSelf = true; - chat.createModal(roomData, loadAndCenter); - }); - } + chat.openChat(roomId, uid); }); }; app.newChat = function (touid, callback) { - function createChat() { - socket.emit('modules.chats.newRoom', { touid: touid }, function (err, roomId) { - if (err) { - return app.alertError(err.message); - } - - if (!ajaxify.data.template.chats) { - app.openChat(roomId); - } else { - ajaxify.go('chats/' + roomId); - } - - callback(false, roomId); - }); - } - - callback = callback || function () { }; - if (!app.user.uid) { - return app.alertError('[[error:not-logged-in]]'); - } - - if (parseInt(touid, 10) === parseInt(app.user.uid, 10)) { - return app.alertError('[[error:cant-chat-with-yourself]]'); - } - socket.emit('modules.chats.isDnD', touid, function (err, isDnD) { - if (err) { - return app.alertError(err.message); - } - if (!isDnD) { - return createChat(); - } - require(['bootbox'], function (bootbox) { - bootbox.confirm('[[modules:chat.confirm-chat-with-dnd-user]]', function (ok) { - if (ok) { - createChat(); - } - }); - }); + console.warn('[deprecated] app.newChat is deprecated, please use chat.newChat'); + require(['chat'], function (chat) { + chat.newChat(touid, callback); }); }; diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js index e46bded766..5bb46becaf 100644 --- a/public/src/client/account/header.js +++ b/public/src/client/account/header.js @@ -32,21 +32,19 @@ define('forum/account/header', [ toggleFollow('unfollow'); }); - components.get('account/chat').on('click', function () { - socket.emit('modules.chats.hasPrivateChat', ajaxify.data.uid, function (err, roomId) { - if (err) { - return app.alertError(err.message); - } - if (roomId) { - app.openChat(roomId); - } else { - app.newChat(ajaxify.data.uid); - } - }); + components.get('account/chat').on('click', async function () { + const roomId = await socket.emit('modules.chats.hasPrivateChat', ajaxify.data.uid); + const chat = await app.require('chat'); + if (roomId) { + chat.openChat(roomId); + } else { + chat.newChat(ajaxify.data.uid); + } }); - components.get('account/new-chat').on('click', function () { - app.newChat(ajaxify.data.uid, function () { + components.get('account/new-chat').on('click', async function () { + const chat = await app.require('chat'); + chat.newChat(ajaxify.data.uid, function () { components.get('account/chat').parent().removeClass('hidden'); }); }); diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 45b958e4f1..c3fc8ff560 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -8,14 +8,14 @@ define('forum/chats', [ 'forum/chats/recent', 'forum/chats/search', 'forum/chats/messages', - 'benchpress', 'composer/autocomplete', 'hooks', 'bootbox', + 'chat', ], function ( components, translator, mousetrap, - recentChats, search, messages, Benchpress, - autocomplete, hooks, bootbox + recentChats, search, messages, + autocomplete, hooks, bootbox, chatModule ) { const Chats = { initialised: false, @@ -93,11 +93,11 @@ define('forum/chats', [ if (app.previousUrl && app.previousUrl.match(/chats/)) { ajaxify.go('user/' + ajaxify.data.userslug + '/chats', function () { - app.openChat(roomId, ajaxify.data.uid); + chatModule.openChat(roomId, ajaxify.data.uid); }, true); } else { window.history.go(-1); - app.openChat(roomId, ajaxify.data.uid); + chatModule.openChat(roomId, ajaxify.data.uid); } $(window).one('action:chat.loaded', function () { @@ -294,9 +294,7 @@ define('forum/chats', [ // Return user to chats page. If modal, close modal. const modal = buttonEl.parents('.chat-modal'); if (modal.length) { - require(['chat'], function (chatLib) { - chatLib.close(modal); - }); + chatModule.close(modal); } else { ajaxify.go('chats'); } @@ -408,12 +406,11 @@ define('forum/chats', [ } else { el.remove(); } - require(['chat'], function (chat) { - const modal = chat.getModal(roomId); - if (modal.length) { - chat.close(modal); - } - }); + + const modal = chatModule.getModal(roomId); + if (modal.length) { + chatModule.close(modal); + } }); }; diff --git a/public/src/client/chats/search.js b/public/src/client/chats/search.js index 82bfcba8cc..fac37f908e 100644 --- a/public/src/client/chats/search.js +++ b/public/src/client/chats/search.js @@ -69,7 +69,9 @@ define('forum/chats/search', ['components', 'api'], function (components, api) { chats.switchChat(roomId); }); } else { - app.newChat(userObj.uid); + require(['chat'], function (chat) { + chat.newChat(userObj.uid); + }); } }); }); diff --git a/public/src/client/flags/detail.js b/public/src/client/flags/detail.js index 81b1592a73..aa8ef07c21 100644 --- a/public/src/client/flags/detail.js +++ b/public/src/client/flags/detail.js @@ -1,6 +1,8 @@ 'use strict'; -define('forum/flags/detail', ['forum/flags/list', 'components', 'translator', 'benchpress', 'forum/account/header', 'accounts/delete', 'api', 'bootbox'], function (FlagsList, components, translator, Benchpress, AccountHeader, AccountsDelete, api, bootbox) { +define('forum/flags/detail', [ + 'components', 'translator', 'benchpress', 'forum/account/header', 'accounts/delete', 'api', 'bootbox', +], function (components, translator, Benchpress, AccountHeader, AccountsDelete, api, bootbox) { const Detail = {}; Detail.init = function () { @@ -59,7 +61,9 @@ define('forum/flags/detail', ['forum/flags/list', 'components', 'translator', 'b break; } case 'chat': - app.newChat(uid); + require(['chat'], function (chat) { + chat.newChat(uid); + }); break; case 'ban': diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 8dab0b0874..36c752fa9f 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -420,8 +420,9 @@ define('forum/topic/postTools', [ function openChat(button) { const post = button.parents('[data-pid]'); - - app.newChat(post.attr('data-uid')); + require(['chat'], function (chat) { + chat.newChat(post.attr('data-uid')); + }); button.parents('.btn-group').find('.dropdown-toggle').click(); return false; } diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 94e4764ec8..d57386040a 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -1,14 +1,80 @@ 'use strict'; define('chat', [ - 'components', - 'taskbar', - 'translator', - 'hooks', -], function (components, taskbar, translator, hooks) { + 'components', 'taskbar', 'translator', 'hooks', 'bootbox', +], function (components, taskbar, translator, hooks, bootbox) { const module = {}; let newMessage = false; + module.openChat = function (roomId, uid) { + if (!app.user.uid) { + return app.alertError('[[error:not-logged-in]]'); + } + + function loadAndCenter(chatModal) { + module.load(chatModal.attr('data-uuid')); + module.center(chatModal); + module.focusInput(chatModal); + } + + if (module.modalExists(roomId)) { + loadAndCenter(module.getModal(roomId)); + } else { + socket.emit('modules.chats.loadRoom', { roomId: roomId, uid: uid || app.user.uid }, function (err, roomData) { + if (err) { + return app.alertError(err.message); + } + roomData.users = roomData.users.filter(function (user) { + return user && parseInt(user.uid, 10) !== parseInt(app.user.uid, 10); + }); + roomData.uid = uid || app.user.uid; + roomData.isSelf = true; + module.createModal(roomData, loadAndCenter); + }); + } + }; + + module.newChat = function (touid, callback) { + function createChat() { + socket.emit('modules.chats.newRoom', { touid: touid }, function (err, roomId) { + if (err) { + return app.alertError(err.message); + } + + if (!ajaxify.data.template.chats) { + module.openChat(roomId); + } else { + ajaxify.go('chats/' + roomId); + } + + callback(null, roomId); + }); + } + + callback = callback || function () { }; + if (!app.user.uid) { + return app.alertError('[[error:not-logged-in]]'); + } + + if (parseInt(touid, 10) === parseInt(app.user.uid, 10)) { + return app.alertError('[[error:cant-chat-with-yourself]]'); + } + socket.emit('modules.chats.isDnD', touid, function (err, isDnD) { + if (err) { + return app.alertError(err.message); + } + if (!isDnD) { + return createChat(); + } + + bootbox.confirm('[[modules:chat.confirm-chat-with-dnd-user]]', function (ok) { + if (ok) { + createChat(); + } + }); + }); + }; + module.loadChatsDropdown = function (chatsListEl) { socket.emit('modules.chats.getRecentChats', { uid: app.user.uid, @@ -37,7 +103,7 @@ define('chat', [ } const roomId = $(this).attr('data-roomid'); if (!ajaxify.currentPage.match(/^chats\//)) { - app.openChat(roomId); + module.openChat(roomId); } else { ajaxify.go('user/' + app.user.userslug + '/chats/' + roomId); } @@ -206,7 +272,7 @@ define('chat', [ module.minimize(uuid); }); - chatModal.on('click', ':not(.close)', function () { + chatModal.on('mouseup', function () { taskbar.updateActive(chatModal.attr('data-uuid')); if (dragged) { From e3f5b706a513c01152d617011730419af3a450f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 8 Nov 2021 22:36:10 -0500 Subject: [PATCH 80/95] test: show body when test fails --- test/controllers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers.js b/test/controllers.js index 452b43d302..8a27c80d3c 100644 --- a/test/controllers.js +++ b/test/controllers.js @@ -379,7 +379,7 @@ describe('Controllers', () => { resolveWithFullResponse: true, }); - assert(res.body.errors.includes('[[error:invalid-email]]')); + assert(res.body.errors.includes('[[error:invalid-email]]'), res.body); }); it('gdpr interstitial should still apply if email requirement is disabled', async () => { From 654c8e61487b0fe04ab0f5e7aede60fb53e1b998 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:37:57 -0500 Subject: [PATCH 81/95] fix(deps): update dependency nodebb-plugin-composer-default to v7.0.13 (#9988) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index db67e3b86b..0ce556f6a8 100644 --- a/install/package.json +++ b/install/package.json @@ -84,7 +84,7 @@ "multiparty": "4.2.2", "@nodebb/bootswatch": "3.4.2", "nconf": "^0.11.2", - "nodebb-plugin-composer-default": "7.0.12", + "nodebb-plugin-composer-default": "7.0.13", "nodebb-plugin-dbsearch": "5.1.0", "nodebb-plugin-emoji": "^3.5.0", "nodebb-plugin-emoji-android": "2.0.5", From 619034484fe5f41cd8d3829de10aaba316fddd65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 8 Nov 2021 22:48:02 -0500 Subject: [PATCH 82/95] refactor: simpler rejoin remove pointless app.cacheBuster = null --- public/src/app.js | 1 - public/src/sockets.js | 34 ++++------------------------------ 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 222a2fa6e1..7d89a18002 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -7,7 +7,6 @@ app.isFocused = true; app.currentRoom = null; app.widgets = {}; app.flags = {}; -app.cacheBuster = null; (function () { let appLoaded = false; diff --git a/public/src/sockets.js b/public/src/sockets.js index c4763b28d5..94bc09dab0 100644 --- a/public/src/sockets.js +++ b/public/src/sockets.js @@ -172,37 +172,11 @@ socket = window.socket; } function reJoinCurrentRoom() { - const url_parts = window.location.pathname.slice(config.relative_path.length).split('/').slice(1); - let room; - - switch (url_parts[0]) { - case 'user': - room = 'user/' + (ajaxify.data ? ajaxify.data.theirid : 0); - break; - case 'topic': - room = 'topic_' + url_parts[1]; - break; - case 'category': - room = 'category_' + url_parts[1]; - break; - case 'recent': - room = 'recent_topics'; - break; - case 'unread': - room = 'unread_topics'; - break; - case 'popular': - room = 'popular_topics'; - break; - case 'admin': - room = 'admin'; - break; - case 'categories': - room = 'categories'; - break; + if (app.currentRoom) { + const current = app.currentRoom; + app.currentRoom = ''; + app.enterRoom(current); } - app.currentRoom = ''; - app.enterRoom(room); } function onReconnecting() { From ef02bdc4671a9dddf9f7378fcd3fd53124b0b730 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:50:05 -0500 Subject: [PATCH 83/95] fix(deps): update dependency nodebb-plugin-composer-default to v7.0.14 (#9989) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 0ce556f6a8..06adaf3017 100644 --- a/install/package.json +++ b/install/package.json @@ -84,7 +84,7 @@ "multiparty": "4.2.2", "@nodebb/bootswatch": "3.4.2", "nconf": "^0.11.2", - "nodebb-plugin-composer-default": "7.0.13", + "nodebb-plugin-composer-default": "7.0.14", "nodebb-plugin-dbsearch": "5.1.0", "nodebb-plugin-emoji": "^3.5.0", "nodebb-plugin-emoji-android": "2.0.5", From cf30876fbf9c2a1c2346aa138f6db9ce1f6fd367 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:50:11 -0500 Subject: [PATCH 84/95] fix(deps): update dependency nodebb-theme-slick to v1.4.16 (#9990) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 06adaf3017..31f91d4c02 100644 --- a/install/package.json +++ b/install/package.json @@ -94,7 +94,7 @@ "nodebb-rewards-essentials": "0.2.0", "nodebb-theme-lavender": "5.3.1", "nodebb-theme-persona": "11.2.21", - "nodebb-theme-slick": "1.4.15", + "nodebb-theme-slick": "1.4.16", "nodebb-theme-vanilla": "12.1.9", "nodebb-widget-essentials": "5.0.4", "nodemailer": "^6.5.0", From 8b4510cc7088d135d7fdeeb1be006f9e98ed87f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 8 Nov 2021 23:28:26 -0500 Subject: [PATCH 85/95] refactor: deprecate app.logout use logout module instead move header related code out of app.js --- public/src/admin/admin.js | 4 +- public/src/app.js | 88 +++---------------------------- public/src/client/account/edit.js | 4 +- public/src/client/header.js | 71 +++++++++++++++++++++++++ public/src/modules/logout.js | 28 ++++++++++ public/src/sockets.js | 8 +-- src/meta/js.js | 1 + 7 files changed, 117 insertions(+), 87 deletions(-) create mode 100644 public/src/client/header.js create mode 100644 public/src/modules/logout.js diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index ebb697f42d..a91572c009 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -54,7 +54,9 @@ } $('[component="logout"]').on('click', function () { - app.logout(); + require(['logout'], function (logout) { + logout(); + }); return false; }); diff --git a/public/src/app.js b/public/src/app.js index 7d89a18002..f486c8f804 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -72,24 +72,15 @@ app.flags = {}; app.handleEarlyClicks(); app.load = function () { - handleStatusChange(); - $('body').on('click', '#new_topic', function (e) { e.preventDefault(); app.newTopic(); }); - $('#header-menu .container').on('click', '[component="user/logout"]', function () { - app.logout(); - return false; - }); - Visibility.change(function (event, state) { app.isFocused = state === 'visible'; }); - createHeaderTooltips(); - registerServiceWorker(); require([ @@ -100,12 +91,10 @@ app.flags = {}; 'messages', 'search', 'forum/unread', - 'forum/header/notifications', - 'forum/header/chat', + 'forum/header', 'timeago/jquery.timeago', - ], function (taskbar, helpers, pagination, translator, messages, search, unread, notifications, chat) { - notifications.prepareDOM(); - chat.prepareDOM(); + ], function (taskbar, helpers, pagination, translator, messages, search, unread, header) { + header.prepareDOM(); translator.prepareDOM(); taskbar.init(); helpers.register(); @@ -144,29 +133,10 @@ app.flags = {}; }; app.logout = function (redirect) { - redirect = redirect === undefined ? true : redirect; - hooks.fire('action:app.logout'); - - $.ajax(config.relative_path + '/logout', { - type: 'POST', - headers: { - 'x-csrf-token': config.csrf_token, - }, - beforeSend: function () { - app.flags._logout = true; - }, - success: function (data) { - hooks.fire('action:app.loggedOut', data); - if (redirect) { - if (data.next) { - window.location.href = data.next; - } else { - window.location.reload(); - } - } - }, + console.warn('[deprecated] app.logout is deprecated, please use logout module directly'); + require(['logout'], function (logout) { + logout(redirect); }); - return false; }; app.alert = function (params) { @@ -314,34 +284,6 @@ app.flags = {}; }); }; - function createHeaderTooltips() { - const env = utils.findBootstrapEnvironment(); - if (env === 'xs' || env === 'sm' || isTouchDevice) { - return; - } - $('#header-menu li a[title]').each(function () { - $(this).tooltip({ - placement: 'bottom', - trigger: 'hover', - title: $(this).attr('title'), - }); - }); - - - $('#search-form').tooltip({ - placement: 'bottom', - trigger: 'hover', - title: $('#search-button i').attr('title'), - }); - - - $('#user_dropdown').tooltip({ - placement: 'bottom', - trigger: 'hover', - title: $('#user_dropdown').attr('title'), - }); - } - app.enableTopicSearch = function (options) { console.warn('[deprecated] app.enableTopicSearch is deprecated, please use search.enableQuickSearch(options)'); require(['search'], function (search) { @@ -363,24 +305,6 @@ app.flags = {}; }); }; - function handleStatusChange() { - $('[component="header/usercontrol"] [data-status]').off('click').on('click', function (e) { - const status = $(this).attr('data-status'); - socket.emit('user.setStatus', status, function (err) { - if (err) { - return app.alertError(err.message); - } - $('[data-uid="' + app.user.uid + '"] [component="user/status"], [component="header/profilelink"] [component="user/status"]') - .removeClass('away online dnd offline') - .addClass(status); - $('[component="header/usercontrol"] [data-status]').each(function () { - $(this).find('span').toggleClass('bold', $(this).attr('data-status') === status); - }); - app.user.status = status; - }); - e.preventDefault(); - }); - } app.updateUserStatus = function (el, status) { if (!el.length) { diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js index 6a001084fc..6c69eb6dba 100644 --- a/public/src/client/account/edit.js +++ b/public/src/client/account/edit.js @@ -89,7 +89,9 @@ define('forum/account/edit', [ } confirmBtn.html(''); - app.logout(); + require(['logout'], function (logout) { + logout(); + }); }); return false; diff --git a/public/src/client/header.js b/public/src/client/header.js new file mode 100644 index 0000000000..c6dfe9edb2 --- /dev/null +++ b/public/src/client/header.js @@ -0,0 +1,71 @@ +'use strict'; + +define('forum/header', ['forum/header/notifications', 'forum/header/chat'], function (notifications, chat) { + const module = {}; + + module.prepareDOM = function () { + notifications.prepareDOM(); + chat.prepareDOM(); + handleStatusChange(); + createHeaderTooltips(); + handleLogout(); + }; + + function handleStatusChange() { + $('[component="header/usercontrol"] [data-status]').off('click').on('click', function (e) { + const status = $(this).attr('data-status'); + socket.emit('user.setStatus', status, function (err) { + if (err) { + return app.alertError(err.message); + } + $('[data-uid="' + app.user.uid + '"] [component="user/status"], [component="header/profilelink"] [component="user/status"]') + .removeClass('away online dnd offline') + .addClass(status); + $('[component="header/usercontrol"] [data-status]').each(function () { + $(this).find('span').toggleClass('bold', $(this).attr('data-status') === status); + }); + app.user.status = status; + }); + e.preventDefault(); + }); + } + + function createHeaderTooltips() { + const env = utils.findBootstrapEnvironment(); + if (env === 'xs' || env === 'sm' || utils.isTouchDevice()) { + return; + } + $('#header-menu li a[title]').each(function () { + $(this).tooltip({ + placement: 'bottom', + trigger: 'hover', + title: $(this).attr('title'), + }); + }); + + + $('#search-form').tooltip({ + placement: 'bottom', + trigger: 'hover', + title: $('#search-button i').attr('title'), + }); + + + $('#user_dropdown').tooltip({ + placement: 'bottom', + trigger: 'hover', + title: $('#user_dropdown').attr('title'), + }); + } + + function handleLogout() { + $('#header-menu .container').on('click', '[component="user/logout"]', function () { + require(['logout'], function (logout) { + logout(); + }); + return false; + }); + } + + return module; +}); diff --git a/public/src/modules/logout.js b/public/src/modules/logout.js new file mode 100644 index 0000000000..400d5c25e1 --- /dev/null +++ b/public/src/modules/logout.js @@ -0,0 +1,28 @@ +'use strict'; + +define('logout', ['hooks'], function (hooks) { + return function logout(redirect) { + redirect = redirect === undefined ? true : redirect; + hooks.fire('action:app.logout'); + + $.ajax(config.relative_path + '/logout', { + type: 'POST', + headers: { + 'x-csrf-token': config.csrf_token, + }, + beforeSend: function () { + app.flags._logout = true; + }, + success: function (data) { + hooks.fire('action:app.loggedOut', data); + if (redirect) { + if (data.next) { + window.location.href = data.next; + } else { + window.location.reload(); + } + } + }, + }); + }; +}); diff --git a/public/src/sockets.js b/public/src/sockets.js index 94bc09dab0..5403717009 100644 --- a/public/src/sockets.js +++ b/public/src/sockets.js @@ -94,7 +94,9 @@ socket = window.socket; socket.on('event:banned', onEventBanned); socket.on('event:unbanned', onEventUnbanned); socket.on('event:logout', function () { - app.logout(); + require(['logout'], function (logout) { + logout(); + }); }); socket.on('event:alert', function (params) { app.alert(params); @@ -128,8 +130,8 @@ socket = window.socket; function handleInvalidSession() { socket.disconnect(); - app.logout(false); - require(['messages'], function (messages) { + require(['messages', 'logout'], function (messages, logout) { + logout(false); messages.showInvalidSession(); }); } diff --git a/src/meta/js.js b/src/meta/js.js index 742d27d61d..6901932869 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -41,6 +41,7 @@ JS.scripts = { // files listed below are only available client-side, or are bundled in to reduce # of network requests on cold load rjs: [ + 'public/src/client/header.js', 'public/src/client/header/chat.js', 'public/src/client/header/notifications.js', 'public/src/client/infinitescroll.js', From 1719bff89cb145c540294a93481518fbed22fce3 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 9 Nov 2021 10:39:45 -0500 Subject: [PATCH 86/95] feat: use auto-generated meta and link tags in ACP, closes #9991 --- src/middleware/admin.js | 3 +++ src/views/admin/header.tpl | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/middleware/admin.js b/src/middleware/admin.js index 8fe54e6a10..67408905ca 100644 --- a/src/middleware/admin.js +++ b/src/middleware/admin.js @@ -40,6 +40,7 @@ middleware.renderHeader = async (req, res, data) => { configs: meta.configs.list(), latestVersion: getLatestVersion(), privileges: privileges.admin.get(req.uid), + tags: meta.tags.parse(req, {}, [], []), }); const { userData } = results; @@ -61,6 +62,8 @@ middleware.renderHeader = async (req, res, data) => { configJSON: jsesc(JSON.stringify(res.locals.config), { isScriptContext: true }), relative_path: res.locals.config.relative_path, adminConfigJSON: encodeURIComponent(JSON.stringify(results.configs)), + metaTags: results.tags.meta, + linkTags: results.tags.link, user: userData, userJSON: jsesc(JSON.stringify(userData), { isScriptContext: true }), plugins: results.custom_header.plugins, diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index a0f5fef1e3..ee81bfeb2d 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -2,8 +2,9 @@ {title} - + {{{each metaTags}}}{function.buildMetaTag}{{{end}}} + {{{each linkTags}}}{function.buildLinkTag}{{{end}}} From 61d1f5650023e0cac7953fd5db1cf311de33558d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 9 Nov 2021 10:51:44 -0500 Subject: [PATCH 87/95] test: socket.emit doesnt exist in tests --- src/socket.io/admin/user.js | 6 ++++-- src/socket.io/index.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.js index e813053137..abb12cceed 100644 --- a/src/socket.io/admin/user.js +++ b/src/socket.io/admin/user.js @@ -172,7 +172,9 @@ User.exportUsersCSV = async function (socket) { setTimeout(async () => { try { await user.exportUsersCSV(); - socket.emit('event:export-users-csv'); + if (socket.emit) { + socket.emit('event:export-users-csv'); + } const notifications = require('../../notifications'); const n = await notifications.create({ bodyShort: '[[notifications:users-csv-exported]]', @@ -182,7 +184,7 @@ User.exportUsersCSV = async function (socket) { }); await notifications.push(n, [socket.uid]); } catch (err) { - winston.error(err); + winston.error(err.stack); } }, 0); }; diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 4d88ed51ee..4dd74db26f 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -253,7 +253,7 @@ Sockets.getCountInRoom = function (room) { }; Sockets.warnDeprecated = (socket, replacement) => { - if (socket.previousEvents) { + if (socket.previousEvents && socket.emit) { socket.emit('event:deprecated_call', { eventName: socket.previousEvents[socket.previousEvents.length - 1], replacement: replacement, From ae64b9f4958ef98af43a28d0cebe436be0758232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 9 Nov 2021 11:05:03 -0500 Subject: [PATCH 88/95] test: add another assert for random failing test --- test/controllers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers.js b/test/controllers.js index 8a27c80d3c..4ac33196d5 100644 --- a/test/controllers.js +++ b/test/controllers.js @@ -378,7 +378,7 @@ describe('Controllers', () => { json: true, resolveWithFullResponse: true, }); - + assert(res.body.errors.length, res.body); assert(res.body.errors.includes('[[error:invalid-email]]'), res.body); }); From 0428912c6d5c626b078469d856bdd7d9cfbef660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 9 Nov 2021 13:34:59 -0500 Subject: [PATCH 89/95] refactor: deprecate app.alert functions user alerts module directly --- public/src/app.js | 44 ++++++++++++------------------------ public/src/modules/alerts.js | 36 +++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index f486c8f804..f1118e3505 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -14,11 +14,6 @@ app.flags = {}; app.cacheBuster = config['cache-buster']; - let hooks; - require(['hooks'], function (_hooks) { - hooks = _hooks; - }); - $(document).ready(function () { ajaxify.parseData(); app.load(); @@ -92,8 +87,9 @@ app.flags = {}; 'search', 'forum/unread', 'forum/header', + 'hooks', 'timeago/jquery.timeago', - ], function (taskbar, helpers, pagination, translator, messages, search, unread, header) { + ], function (taskbar, helpers, pagination, translator, messages, search, unread, header, hooks) { header.prepareDOM(); translator.prepareDOM(); taskbar.init(); @@ -140,42 +136,30 @@ app.flags = {}; }; app.alert = function (params) { + console.warn('[deprecated] app.alert is deprecated, please use alerts.alert'); require(['alerts'], function (alerts) { alerts.alert(params); }); }; app.removeAlert = function (id) { + console.warn('[deprecated] app.removeAlert is deprecated, please use alerts.remove'); require(['alerts'], function (alerts) { alerts.remove(id); }); }; app.alertSuccess = function (message, timeout) { - app.alert({ - alert_id: utils.generateUUID(), - title: '[[global:alert.success]]', - message: message, - type: 'success', - timeout: timeout || 5000, + console.warn('[deprecated] app.alertSuccess is deprecated, please use alerts.success'); + require(['alerts'], function (alerts) { + alerts.success(message, timeout); }); }; app.alertError = function (message, timeout) { - message = (message && message.message) || message; - - if (message === '[[error:revalidate-failure]]') { - socket.disconnect(); - app.reconnect(); - return; - } - - app.alert({ - alert_id: utils.generateUUID(), - title: '[[global:alert.error]]', - message: message, - type: 'danger', - timeout: timeout || 10000, + console.warn('[deprecated] app.alertError is deprecated, please use alerts.error'); + require(['alerts'], function (alerts) { + alerts.error(message, timeout); }); }; @@ -322,9 +306,11 @@ app.flags = {}; }; app.newTopic = function (cid, tags) { - hooks.fire('action:composer.topic.new', { - cid: cid || ajaxify.data.cid || 0, - tags: tags || (ajaxify.data.tag ? [ajaxify.data.tag] : []), + require(['hooks'], function (hooks) { + hooks.fire('action:composer.topic.new', { + cid: cid || ajaxify.data.cid || 0, + tags: tags || (ajaxify.data.tag ? [ajaxify.data.tag] : []), + }); }); }; diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js index 5bbd40bf3c..da0fc006e7 100644 --- a/public/src/modules/alerts.js +++ b/public/src/modules/alerts.js @@ -18,6 +18,38 @@ define('alerts', ['translator', 'components', 'hooks'], function (translator, co } }; + module.success = function (message, timeout) { + module.alert({ + alert_id: utils.generateUUID(), + title: '[[global:alert.success]]', + message: message, + type: 'success', + timeout: timeout || 5000, + }); + }; + + module.error = function (message, timeout) { + message = (message && message.message) || message; + + if (message === '[[error:revalidate-failure]]') { + socket.disconnect(); + app.reconnect(); + return; + } + + module.alert({ + alert_id: utils.generateUUID(), + title: '[[global:alert.error]]', + message: message, + type: 'danger', + timeout: timeout || 10000, + }); + }; + + module.remove = function (id) { + $('#alert_button_' + id).remove(); + }; + function createNew(params) { app.parseAndTranslate('alert', params, function (html) { let alert = $('#' + params.alert_id); @@ -56,10 +88,6 @@ define('alerts', ['translator', 'components', 'hooks'], function (translator, co }); } - module.remove = function (id) { - $('#alert_button_' + id).remove(); - }; - function updateAlert(alert, params) { alert.find('strong').html(params.title); alert.find('p').html(params.message); From 96f13e4f5d127a4362d1e86f6f7839fd3865a363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 9 Nov 2021 19:29:29 -0500 Subject: [PATCH 90/95] feat: #9992, hooks.one --- public/src/modules/hooks.js | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/public/src/modules/hooks.js b/public/src/modules/hooks.js index c474d9b15f..f324bc706e 100644 --- a/public/src/modules/hooks.js +++ b/public/src/modules/hooks.js @@ -4,6 +4,7 @@ define('hooks', [], () => { const Hooks = { loaded: {}, temporary: new Set(), + runOnce: new Set(), deprecated: { 'action:script.load': 'filter:script.load', // 👋 @ 1.18.0 'action:category.loaded': 'action:topics.loaded', // 👋 @ 1.19.0 @@ -32,6 +33,10 @@ define('hooks', [], () => { console.debug(`[hooks] Registered ${hookName}`, method); }; Hooks.on = Hooks.register; + Hooks.one = (hookName, method) => { + Hooks.register(hookName, method); + Hooks.runOnce.add({ hookName, method }); + }; // registerPage/onPage takes care of unregistering the listener on ajaxify Hooks.registerPage = (hookName, method) => { @@ -110,17 +115,27 @@ define('hooks', [], () => { Hooks.fire = (hookName, data) => { const type = hookName.split(':').shift(); - + let result; switch (type) { case 'filter': - return _fireFilterHook(hookName, data); + result = _fireFilterHook(hookName, data); + break; case 'action': - return _fireActionHook(hookName, data); + result = _fireActionHook(hookName, data); + break; case 'static': - return _fireStaticHook(hookName, data); + result = _fireStaticHook(hookName, data); + break; } + Hooks.runOnce.forEach((pair) => { + if (pair.hookName === hookName) { + Hooks.unregister(hookName, pair.method); + Hooks.runOnce.delete(pair); + } + }); + return result; }; return Hooks; From 41c3eb8298d30a85e6d885e048a91adf37fa60bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 9 Nov 2021 19:38:35 -0500 Subject: [PATCH 91/95] refactor: shorter require --- public/src/app.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index f1118e3505..6154c8b323 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -115,10 +115,9 @@ app.flags = {}; }; app.require = async (modules) => { // allows you to await require.js modules - let single = false; - if (!Array.isArray(modules)) { + const single = !Array.isArray(modules); + if (single) { modules = [modules]; - single = true; } return new Promise((resolve, reject) => { From 975cb5126271105736b85da64af759ae6773290d Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 10 Nov 2021 09:07:28 +0000 Subject: [PATCH 92/95] Latest translations and fallbacks --- .../language/he/admin/settings/advanced.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/public/language/he/admin/settings/advanced.json b/public/language/he/admin/settings/advanced.json index 2f71a62b2a..621a94adb3 100644 --- a/public/language/he/admin/settings/advanced.json +++ b/public/language/he/admin/settings/advanced.json @@ -5,14 +5,14 @@ "maintenance-mode.message": "הודעת תחזוקה", "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", - "headers.csp-frame-ancestors-help": "'none', 'self'(default) or list of URIs to allow.", + "headers.csp-frame-ancestors": "הגדר את מדיניות האבטחה (Content-Security-Policy) עבור ההטמעה (frame-ancestors) של NodeBB בתוך Iframe", + "headers.csp-frame-ancestors-help": "בחר מילים שמורות כמו 'none' (ללא) 'self' (רק מהאתר שלי) או כתובת מלאה של אתר חיצוני", "headers.powered-by": "התאם אישית את הכותרת \"מופעל ע\"י\" הברירת מחדל של נודביבי", - "headers.acao": "Access-Control-Allow-Origin", - "headers.acao-regex": "Access-Control-Allow-Origin Regular Expression", + "headers.acao": "אתרים הרשאים לקרוא לאתר זה (Access-Control-Allow-Origin)", + "headers.acao-regex": "תבנית טקסט (Regex) עבור אתרים הרשאים לקרוא לאתר זה (Access-Control-Allow-Origin)", "headers.acao-help": "כדי למנוע גישה לכל האתרים, השאר ריק", - "headers.acao-regex-help": "Enter regular expressions here to match dynamic origins. To deny access to all sites, leave empty", - "headers.acac": "Access-Control-Allow-Credentials", + "headers.acao-regex-help": "הכנס תבנית טקסט (Regex) כאן כדי לאפשר קריאה דינאמית מאתרים חיצוניים. אם ברצונך לחסום כל גישה חיצונית, השאר ריק.", + "headers.acac": "אתרים אשר אל בקשות אליהם, יתווספו גם נתוני כניסה כגוןCookie וכו'. ( Access-Control-Allow-Credentials)", "headers.acam": "Access-Control-Allow-Methods", "headers.acah": "Access-Control-Allow-Headers", "hsts": "Strict Transport Security", @@ -26,13 +26,13 @@ "traffic.enable": "Enable Traffic Management", "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.lag-check-interval": "Check Interval (in milliseconds)", + "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)", - "sockets.settings": "WebSocket Settings", - "sockets.max-attempts": "Max Reconnection Attempts", + "sockets.settings": "הגדרות חיבור WebSocket", + "sockets.max-attempts": "מקסימום מספר נסיונות חיבור מחדש", "sockets.default-placeholder": "ברירת מחדל: %1", - "sockets.delay": "Reconnection Delay", + "sockets.delay": "זמן השעייה בן נסיונות חיבור מחדש", "analytics.settings": "Analytics Settings", "analytics.max-cache": "Analytics Cache Max Value", From 45a0895c34ef90d572e415faeaa3124066dfd1ff Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 10 Nov 2021 10:22:12 +0000 Subject: [PATCH 93/95] chore(deps): update dependency eslint-plugin-import to v2.25.3 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 31f91d4c02..22325d77db 100644 --- a/install/package.json +++ b/install/package.json @@ -147,7 +147,7 @@ "coveralls": "3.1.1", "eslint": "7.32.0", "eslint-config-nodebb": "0.0.3", - "eslint-plugin-import": "2.25.2", + "eslint-plugin-import": "2.25.3", "grunt": "1.4.1", "grunt-contrib-watch": "1.1.0", "husky": "7.0.4", From dad31c8ea281ce200d67fe1d19a0411ff51ae5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 10 Nov 2021 15:32:36 -0500 Subject: [PATCH 94/95] chore: update badges, remove david doesnt work --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 3f1527d221..51aae14227 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ # ![NodeBB](public/images/logo.svg) -[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB) +![Workflow](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/NodeBB/NodeBB/badge.svg?branch=master)](https://coveralls.io/github/NodeBB/NodeBB?branch=master) -[![Dependency Status](https://david-dm.org/nodebb/nodebb.svg?path=install)](https://david-dm.org/nodebb/nodebb?path=install) [![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB) [**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and supports either Redis, MongoDB, or a PostgreSQL database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB has many modern features out of the box such as social network integration and streaming discussions, while still making sure to be compatible with older browsers. From a0f0dd021b6b275d377aec83956a8fc0a0e7aa52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 10 Nov 2021 15:33:15 -0500 Subject: [PATCH 95/95] chore: make it a link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51aae14227..ec072e3a3a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ![NodeBB](public/images/logo.svg) -![Workflow](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml/badge.svg) +[![Workflow](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml/badge.svg)](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml) [![Coverage Status](https://coveralls.io/repos/github/NodeBB/NodeBB/badge.svg?branch=master)](https://coveralls.io/github/NodeBB/NodeBB?branch=master) [![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)