From e616b2e16dcebd747111aaca2180e4dd4fb642fc Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Thu, 28 Jul 2022 18:21:06 +0000 Subject: [PATCH 1/9] chore: incrementing version number - v2.3.0 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index b77f899a87..363b261ac9 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "2.2.5", + "version": "2.3.0", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From a6f7fff0ad376369d84c178f72f8e35877a45bcf Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Thu, 28 Jul 2022 18:21:07 +0000 Subject: [PATCH 2/9] chore: update changelog for v2.3.0 --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9aa6d52c4..2259da6386 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,40 @@ +#### v2.3.0 (2022-07-28) + +##### Chores + +* **deps:** + * update dependency lint-staged to v13 (07ce0c39) + * bump ace-builds from 1.7.1 to 1.8.1 in /install (f397d968) + * bump ioredis from 5.2.0 to 5.2.2 in /install (067a5110) +* have renovate work off of `develop` branch instead (f334e398) +* update changelog for v2.2.5 (6c3ebf3b) + +##### New Features + +* add client side filter:chat.send, closes #10729 (b2da02d6) +* UI changes for ACP > Manage > Categories (#10782) (820bc994) +* show an informative message when no plugins are found after filtering (6840a742) +* Allow defining active plugins in config (#10767) (23cb67a1) +* allow plugins to toggle whether IPs are shown in the users CSV export (a6af47da) +* fire hook to allow plugins to filter the pids returned in a user profile (c26be43a) +* closes #10719, don't trim children if category is marked section (7e80cc10) + +##### Bug Fixes + +* **deps:** + * update dependency mongodb to v4.8.1 (8384b7cf) + * update dependency helmet to v5.1.1 (03a173bb) +* bug where fallback to forum search was not working due to client-side error (25046642) +* better looking placeholder text for ACP search (1b9c6819) +* use `user.hidePrivateData();` more consistently across user retrieval endpoints (0529f2fb) +* minor margin tweak for alert in acp header (4faf0cdf) +* cannot turn off all networks (bbc7f2af) +* cannot setting networks for sharing posts (2e088a8e) + +##### Refactors + +* invert helmet configuration (dcacd815) + #### v2.2.5 (2022-07-21) ##### Chores From 17120e034b5d89ef55702b544309abc382758162 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Thu, 28 Jul 2022 18:23:10 +0000 Subject: [PATCH 3/9] chore(i18n): fallback strings for new resources: nodebb.admin-settings-advanced, nodebb.admin-menu, nodebb.error --- public/language/ar/admin/menu.json | 2 +- public/language/bg/admin/menu.json | 2 +- public/language/bn/admin/menu.json | 2 +- public/language/cs/admin/menu.json | 2 +- public/language/da/admin/menu.json | 2 +- public/language/de/admin/menu.json | 2 +- public/language/el/admin/menu.json | 2 +- public/language/en-US/admin/menu.json | 2 +- public/language/en-x-pirate/admin/menu.json | 2 +- public/language/es/admin/menu.json | 2 +- public/language/et/admin/menu.json | 2 +- public/language/fa-IR/admin/menu.json | 2 +- public/language/fi/admin/menu.json | 2 +- public/language/fr/admin/menu.json | 2 +- public/language/gl/admin/menu.json | 2 +- public/language/he/admin/menu.json | 2 +- public/language/hr/admin/menu.json | 2 +- public/language/hu/admin/menu.json | 2 +- public/language/id/admin/menu.json | 2 +- public/language/it/admin/menu.json | 2 +- public/language/it/error.json | 4 ++-- public/language/ja/admin/menu.json | 2 +- public/language/ko/admin/menu.json | 2 +- public/language/lt/admin/menu.json | 2 +- public/language/lv/admin/menu.json | 2 +- public/language/ms/admin/menu.json | 2 +- public/language/nb/admin/menu.json | 2 +- public/language/nl/admin/menu.json | 2 +- public/language/pl/admin/menu.json | 2 +- public/language/pt-BR/admin/menu.json | 2 +- public/language/pt-PT/admin/menu.json | 2 +- public/language/ro/admin/menu.json | 2 +- public/language/ru/admin/menu.json | 2 +- public/language/rw/admin/menu.json | 2 +- public/language/sc/admin/menu.json | 2 +- public/language/sk/admin/menu.json | 2 +- public/language/sl/admin/menu.json | 2 +- public/language/sq-AL/admin/menu.json | 2 +- public/language/sr/admin/menu.json | 2 +- public/language/sv/admin/menu.json | 2 +- public/language/th/admin/menu.json | 2 +- public/language/tr/admin/menu.json | 2 +- public/language/uk/admin/menu.json | 2 +- public/language/vi/admin/menu.json | 2 +- public/language/zh-CN/admin/menu.json | 2 +- public/language/zh-TW/admin/menu.json | 2 +- 46 files changed, 47 insertions(+), 47 deletions(-) diff --git a/public/language/ar/admin/menu.json b/public/language/ar/admin/menu.json index 97d0fa4dfc..028ee61cef 100644 --- a/public/language/ar/admin/menu.json +++ b/public/language/ar/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/bg/admin/menu.json b/public/language/bg/admin/menu.json index 6b2b2fc2c7..ee7113eb8f 100644 --- a/public/language/bg/admin/menu.json +++ b/public/language/bg/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Изход", "view-forum": "Преглед на форума", - "search.placeholder": "Натиснете „/“ за търсене на настройки", + "search.placeholder": "Search settings", "search.no-results": "Няма резултати…", "search.search-forum": "Търсене във форума за ", "search.keep-typing": "Продължете да пишете, за да видите още резултати…", diff --git a/public/language/bn/admin/menu.json b/public/language/bn/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/bn/admin/menu.json +++ b/public/language/bn/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/cs/admin/menu.json b/public/language/cs/admin/menu.json index 603d9616fe..d22f9a6bdd 100644 --- a/public/language/cs/admin/menu.json +++ b/public/language/cs/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Odhlásit", "view-forum": "Zobrazit fórum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "Žádné výsledky…", "search.search-forum": "Prohledat fórum pro ", "search.keep-typing": "Pište dále pro zobrazení výsledků…", diff --git a/public/language/da/admin/menu.json b/public/language/da/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/da/admin/menu.json +++ b/public/language/da/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/de/admin/menu.json b/public/language/de/admin/menu.json index 6244d2cad1..07a3c5937b 100644 --- a/public/language/de/admin/menu.json +++ b/public/language/de/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Abmelden", "view-forum": "Forum anzeigen", - "search.placeholder": "Drücke "/" um nach Einstellungen zu suchen", + "search.placeholder": "Search settings", "search.no-results": "Keine Ergebnisse...", "search.search-forum": "Suche im Forum nach ", "search.keep-typing": "Gib mehr ein, um die Ergebnisse zu sehen...", diff --git a/public/language/el/admin/menu.json b/public/language/el/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/el/admin/menu.json +++ b/public/language/el/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/en-US/admin/menu.json b/public/language/en-US/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/en-US/admin/menu.json +++ b/public/language/en-US/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/en-x-pirate/admin/menu.json b/public/language/en-x-pirate/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/en-x-pirate/admin/menu.json +++ b/public/language/en-x-pirate/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/es/admin/menu.json b/public/language/es/admin/menu.json index d9e2ce06b3..d59ea10b71 100644 --- a/public/language/es/admin/menu.json +++ b/public/language/es/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Cerrar sesión", "view-forum": "Ver foro", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "Sin resultados...", "search.search-forum": "Buscar en el foro ", "search.keep-typing": "Escribe más para ver resultados...", diff --git a/public/language/et/admin/menu.json b/public/language/et/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/et/admin/menu.json +++ b/public/language/et/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/fa-IR/admin/menu.json b/public/language/fa-IR/admin/menu.json index 7fa68c6830..135e14ace0 100644 --- a/public/language/fa-IR/admin/menu.json +++ b/public/language/fa-IR/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "هیچ نتیجه ای وجود ندارد", "search.search-forum": "جستجو در انجمن برای ", "search.keep-typing": "لطفا برای مشاهده نتیجه بیشتر بنویسید", diff --git a/public/language/fi/admin/menu.json b/public/language/fi/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/fi/admin/menu.json +++ b/public/language/fi/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/fr/admin/menu.json b/public/language/fr/admin/menu.json index 196f86ce5c..e5f477dc00 100644 --- a/public/language/fr/admin/menu.json +++ b/public/language/fr/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Déconnexion ", "view-forum": "Voir le forum", - "search.placeholder": "Appuyez sur "/" pour rechercher dans les paramètres", + "search.placeholder": "Search settings", "search.no-results": "Aucun résultat…", "search.search-forum": "Rechercher dans le forum", "search.keep-typing": "Continuez de taper pour afficher les résultats…", diff --git a/public/language/gl/admin/menu.json b/public/language/gl/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/gl/admin/menu.json +++ b/public/language/gl/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/he/admin/menu.json b/public/language/he/admin/menu.json index 95890e7d15..30888f99b2 100644 --- a/public/language/he/admin/menu.json +++ b/public/language/he/admin/menu.json @@ -76,7 +76,7 @@ "logout": "התנתק", "view-forum": "כניסה לפורום", - "search.placeholder": "הקלד "/" בכדי לחפש הגדרה", + "search.placeholder": "Search settings", "search.no-results": "אין תוצאות...", "search.search-forum": "חפש בפורום ", "search.keep-typing": "המשך להקליד על מנת למצוא תוצאות...", diff --git a/public/language/hr/admin/menu.json b/public/language/hr/admin/menu.json index 4dd18a9204..7145bdc4fc 100644 --- a/public/language/hr/admin/menu.json +++ b/public/language/hr/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Odjava", "view-forum": "Pogledaj forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "Nema rezultata ...", "search.search-forum": "Pretraži forum za ", "search.keep-typing": "Upiši više da vidiš rezultate ...", diff --git a/public/language/hu/admin/menu.json b/public/language/hu/admin/menu.json index e2329570bb..b3340a00da 100644 --- a/public/language/hu/admin/menu.json +++ b/public/language/hu/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Kilépés", "view-forum": "Fórum megtekintése", - "search.placeholder": "Nyomd meg a "/"-t beállítások kereséséhez", + "search.placeholder": "Search settings", "search.no-results": "Nincs eredmény...", "search.search-forum": " keresése a fórumon", "search.keep-typing": "Gépelj többet az eredményekért...", diff --git a/public/language/id/admin/menu.json b/public/language/id/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/id/admin/menu.json +++ b/public/language/id/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/it/admin/menu.json b/public/language/it/admin/menu.json index 8851052e87..fc0b6f6bf2 100644 --- a/public/language/it/admin/menu.json +++ b/public/language/it/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Esci", "view-forum": "Vista Forum", - "search.placeholder": "Premi "/" per cercare le impostazioni", + "search.placeholder": "Search settings", "search.no-results": "Niente risultati...", "search.search-forum": "Cerca nel forum per ", "search.keep-typing": "Scrivi altro per vedere risultati...", diff --git a/public/language/it/error.json b/public/language/it/error.json index 0e3e0ada11..ed6895dc00 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -205,8 +205,8 @@ "no-connection": "Sembra ci sia un problema con la tua connessione internet", "socket-reconnect-failed": "Impossibile raggiungere il server al momento. Clicca qui per riprovare o riprova in un secondo momento", "plugin-not-whitelisted": "Impossibile installare il plug-in & solo i plugin nella whitelist del Gestione Pacchetti di NodeBB possono essere installati tramite ACP", - "plugins-set-in-configuration": "You are not allowed to change plugin state as they are defined at runtime (config.json, environmental variables or terminal arguments), please modify the configuration instead.", - "theme-not-set-in-configuration": "When defining active plugins in configuration, changing themes requires adding the new theme to the list of active plugins before updating it in the ACP", + "plugins-set-in-configuration": "Non è possibile modificare lo stato dei plugin, poiché sono definiti in fase di esecuzione. (config.json, variabili ambientali o argomenti del terminale); modificare invece la configurazione.", + "theme-not-set-in-configuration": "Quando si definiscono i plugin attivi nella configurazione, la modifica dei temi richiede l'aggiunta del nuovo tema all'elenco dei plugin attivi prima di aggiornarlo nell'ACP", "topic-event-unrecognized": "Evento discussione '%1' non riconosciuto", "cant-set-child-as-parent": "Impossibile impostare figlio come categoria padre", "cant-set-self-as-parent": "Impossibile impostare se stessi come categoria padre", diff --git a/public/language/ja/admin/menu.json b/public/language/ja/admin/menu.json index 35eec8d76c..8769bc3143 100644 --- a/public/language/ja/admin/menu.json +++ b/public/language/ja/admin/menu.json @@ -76,7 +76,7 @@ "logout": "ログアウト", "view-forum": "フォーラムを表示", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "結果がありません...", "search.search-forum": "フォーラムでを検索", "search.keep-typing": "結果を見るにはもっと入力してください...", diff --git a/public/language/ko/admin/menu.json b/public/language/ko/admin/menu.json index b28b897736..f495308092 100644 --- a/public/language/ko/admin/menu.json +++ b/public/language/ko/admin/menu.json @@ -76,7 +76,7 @@ "logout": "로그아웃", "view-forum": "포럼 보기", - "search.placeholder": ""/"를 눌러 설정 검색", + "search.placeholder": "Search settings", "search.no-results": "검색 결과 없음...", "search.search-forum": "포럼에서 검색", "search.keep-typing": "검색 결과를 보기 위해 더 입력하세요...", diff --git a/public/language/lt/admin/menu.json b/public/language/lt/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/lt/admin/menu.json +++ b/public/language/lt/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/lv/admin/menu.json b/public/language/lv/admin/menu.json index c97b9b0cb3..5a56214054 100644 --- a/public/language/lv/admin/menu.json +++ b/public/language/lv/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Izlogoties", "view-forum": "Uz forumu", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "Nav rezultātu...", "search.search-forum": "Forumā meklēt ", "search.keep-typing": "Rakstīt vairāk, lai redzētu rezultātus...", diff --git a/public/language/ms/admin/menu.json b/public/language/ms/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/ms/admin/menu.json +++ b/public/language/ms/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/nb/admin/menu.json b/public/language/nb/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/nb/admin/menu.json +++ b/public/language/nb/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/nl/admin/menu.json b/public/language/nl/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/nl/admin/menu.json +++ b/public/language/nl/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/pl/admin/menu.json b/public/language/pl/admin/menu.json index 55223f5f0e..03219f99fb 100644 --- a/public/language/pl/admin/menu.json +++ b/public/language/pl/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Wyloguj się", "view-forum": "Zobacz forum", - "search.placeholder": "Naciśnij "/" aby wyszukać ustawienia", + "search.placeholder": "Search settings", "search.no-results": "Brak wyników...", "search.search-forum": "Szukaj w forum ", "search.keep-typing": "Wpisz więcej, aby zobaczyć wyniki ...", diff --git a/public/language/pt-BR/admin/menu.json b/public/language/pt-BR/admin/menu.json index 9e620cd716..e146ab8d61 100644 --- a/public/language/pt-BR/admin/menu.json +++ b/public/language/pt-BR/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Sair da Conta", "view-forum": "Ver Fórum", - "search.placeholder": "Pressione \"/\" para pesquisar por configurações", + "search.placeholder": "Search settings", "search.no-results": "Sem resultados...", "search.search-forum": "Pesquisar o fórum por ", "search.keep-typing": "Digite para ver mais resultados...", diff --git a/public/language/pt-PT/admin/menu.json b/public/language/pt-PT/admin/menu.json index 925af96d95..35d3d4af31 100644 --- a/public/language/pt-PT/admin/menu.json +++ b/public/language/pt-PT/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Terminar sessão", "view-forum": "Ver Fórum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "Sem resultados...", "search.search-forum": "Procurar no fórum por ", "search.keep-typing": "Digita mais para veres resultados...", diff --git a/public/language/ro/admin/menu.json b/public/language/ro/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/ro/admin/menu.json +++ b/public/language/ro/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/ru/admin/menu.json b/public/language/ru/admin/menu.json index 76f895e641..3ec3e5ce5c 100644 --- a/public/language/ru/admin/menu.json +++ b/public/language/ru/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Выйти", "view-forum": "Перейти на форум", - "search.placeholder": "Введите "/" для поиска настроек", + "search.placeholder": "Search settings", "search.no-results": "Нет результата...", "search.search-forum": "Искать на форуме", "search.keep-typing": "Наберите ещё что-нибудь, чтобы увидеть результат...", diff --git a/public/language/rw/admin/menu.json b/public/language/rw/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/rw/admin/menu.json +++ b/public/language/rw/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/sc/admin/menu.json b/public/language/sc/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/sc/admin/menu.json +++ b/public/language/sc/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/sk/admin/menu.json b/public/language/sk/admin/menu.json index 12aa2962be..7c42194fa7 100644 --- a/public/language/sk/admin/menu.json +++ b/public/language/sk/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Odhlásiť", "view-forum": "Zobraziť fórum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "Žiadne výsledky...", "search.search-forum": "Prehľadať fórum pre ", "search.keep-typing": "Píšte viac pre zobrazenie výsledkov...", diff --git a/public/language/sl/admin/menu.json b/public/language/sl/admin/menu.json index 14b3e8c210..49412fc084 100644 --- a/public/language/sl/admin/menu.json +++ b/public/language/sl/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Odjavi se", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "Ni rezultatov...", "search.search-forum": "Na forumu poišči ", "search.keep-typing": "Vnesite več, da vidite rezultate...", diff --git a/public/language/sq-AL/admin/menu.json b/public/language/sq-AL/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/sq-AL/admin/menu.json +++ b/public/language/sq-AL/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/sr/admin/menu.json b/public/language/sr/admin/menu.json index 1b369a0fcd..02074b61c0 100644 --- a/public/language/sr/admin/menu.json +++ b/public/language/sr/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Izloguj se", "view-forum": "Pogledaj Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "Nema rezultata...", "search.search-forum": "Pretraži forum za ", "search.keep-typing": "Ukucaj više da vidiš rezultate", diff --git a/public/language/sv/admin/menu.json b/public/language/sv/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/sv/admin/menu.json +++ b/public/language/sv/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/th/admin/menu.json b/public/language/th/admin/menu.json index 5b22fbeb36..379e0b2687 100644 --- a/public/language/th/admin/menu.json +++ b/public/language/th/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Log out", "view-forum": "View Forum", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "No results...", "search.search-forum": "Search the forum for ", "search.keep-typing": "Type more to see results...", diff --git a/public/language/tr/admin/menu.json b/public/language/tr/admin/menu.json index 821acc2ed1..1976645b73 100644 --- a/public/language/tr/admin/menu.json +++ b/public/language/tr/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Çıkış", "view-forum": "Forumu Görüntüle", - "search.placeholder": "Ayarları aramak için "/" işaretine tıklayın", + "search.placeholder": "Search settings", "search.no-results": "Sonuç yok...", "search.search-forum": "Forumda ara: ", "search.keep-typing": "Sonuçları görmek için daha fazla yazın...", diff --git a/public/language/uk/admin/menu.json b/public/language/uk/admin/menu.json index 7dd7c875fb..8a44556a55 100644 --- a/public/language/uk/admin/menu.json +++ b/public/language/uk/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Вийти", "view-forum": "Переглянути форум", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "Без результатів...", "search.search-forum": "Шукати на форумі ", "search.keep-typing": "Для результатів, надрукуйте ще...", diff --git a/public/language/vi/admin/menu.json b/public/language/vi/admin/menu.json index d44cc4d246..d1818e0b17 100644 --- a/public/language/vi/admin/menu.json +++ b/public/language/vi/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Đăng xuất", "view-forum": "Xem diễn đàn", - "search.placeholder": "Nhấn "/" để tìm kiếm cài đặt", + "search.placeholder": "Search settings", "search.no-results": "Ko có kết quả...", "search.search-forum": "Tìm kiếm diễn đàn cho ", "search.keep-typing": "Nhập thêm để xem kết quả...", diff --git a/public/language/zh-CN/admin/menu.json b/public/language/zh-CN/admin/menu.json index 450f7662bf..8857255b41 100644 --- a/public/language/zh-CN/admin/menu.json +++ b/public/language/zh-CN/admin/menu.json @@ -76,7 +76,7 @@ "logout": "登出", "view-forum": "查看论坛", - "search.placeholder": "按下"/"以设置搜索", + "search.placeholder": "Search settings", "search.no-results": "没有可用结果…", "search.search-forum": "搜索论坛为", "search.keep-typing": "输入更多以查看结果...", diff --git a/public/language/zh-TW/admin/menu.json b/public/language/zh-TW/admin/menu.json index 22213c257f..d8804bbfd0 100644 --- a/public/language/zh-TW/admin/menu.json +++ b/public/language/zh-TW/admin/menu.json @@ -76,7 +76,7 @@ "logout": "登出", "view-forum": "檢視論壇", - "search.placeholder": "Press "/" to search for settings", + "search.placeholder": "Search settings", "search.no-results": "沒有可用結果…", "search.search-forum": "搜索論壇為", "search.keep-typing": "輸入更多以查看結果...", From 9f225e7062bd8eda5c1492cc5112c277942e8cf0 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 28 Jul 2022 14:27:37 -0400 Subject: [PATCH 4/9] fix(deps): update persona to v12.0.14 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 363b261ac9..2ea3f3cc97 100644 --- a/install/package.json +++ b/install/package.json @@ -97,7 +97,7 @@ "nodebb-plugin-spam-be-gone": "1.0.0", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", - "nodebb-theme-persona": "12.0.12", + "nodebb-theme-persona": "12.0.14", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", From 5176fb1544aec716949efbbdd56a4ee56afebb74 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 28 Jul 2022 15:13:35 -0400 Subject: [PATCH 5/9] feat: add emoji to startup logs, because procrastination. --- src/webserver.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/webserver.js b/src/webserver.js index e143c70968..72cfe2e1f1 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -83,7 +83,7 @@ exports.listen = async function () { helpers.register(); logger.init(app); await initializeNodeBB(); - winston.info('NodeBB Ready'); + winston.info('🪄 NodeBB Ready'); require('./socket.io').server.emit('event:nodebb.ready', { 'cache-buster': meta.config['cache-buster'], @@ -258,7 +258,7 @@ async function listen() { } port = parseInt(port, 10); if ((port !== 80 && port !== 443) || nconf.get('trust_proxy') === true) { - winston.info('Enabling \'trust proxy\''); + winston.info('🤝 Enabling \'trust proxy\''); app.enable('trust proxy'); } @@ -288,8 +288,8 @@ async function listen() { reject(err); } - winston.info(`NodeBB is now listening on: ${chalk.yellow(onText)}`); - winston.info(`Canonical URL: ${chalk.yellow(nconf.get('url'))}`); + winston.info(`📡 NodeBB is now listening on: ${chalk.yellow(onText)}`); + winston.info(`🔗 Canonical URL: ${chalk.yellow(nconf.get('url'))}`); if (oldUmask) { process.umask(oldUmask); } From 847d2b9141cce63b1dc5099b75f56d9c1bda1305 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 28 Jul 2022 15:58:17 -0400 Subject: [PATCH 6/9] fix: #10795, early return for selection tooltip based on calling user privilege --- public/src/client/topic/postTools.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 8b46eb3485..28b1119a3f 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -478,6 +478,10 @@ define('forum/topic/postTools', [ const selectionChangeFn = utils.debounce(selectionChange, 100); function handleSelectionTooltip() { + if (!ajaxify.data.privileges['topics:reply']) { + return; + } + hooks.onPage('action:posts.loaded', delayedTooltip); $(document).off('selectionchange', selectionChangeFn).on('selectionchange', selectionChangeFn); From a99006251cf6a406e2fdca17de4eaa9a8930a936 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:24:29 +0000 Subject: [PATCH 7/9] chore(deps): bump webpack from 5.73.0 to 5.74.0 in /install Bumps [webpack](https://github.com/webpack/webpack) from 5.73.0 to 5.74.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.73.0...v5.74.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 2ea3f3cc97..df368bcf3f 100644 --- a/install/package.json +++ b/install/package.json @@ -137,7 +137,7 @@ "uglify-es": "3.3.9", "validator": "13.7.0", "visibilityjs": "2.0.2", - "webpack": "5.73.0", + "webpack": "5.74.0", "webpack-merge": "5.8.0", "winston": "3.8.1", "xml": "1.0.1", From 7b606d2e594628fb6f46fc2d5ed3d9cef42beaf0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Jul 2022 23:28:10 +0000 Subject: [PATCH 8/9] chore(deps): bump sanitize-html from 2.7.0 to 2.7.1 in /install Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/apostrophecms/sanitize-html/releases) - [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md) - [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.7.0...2.7.1) --- updated-dependencies: - dependency-name: sanitize-html dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index df368bcf3f..e2b8e1a8a9 100644 --- a/install/package.json +++ b/install/package.json @@ -116,7 +116,7 @@ "request-promise-native": "1.0.9", "rimraf": "3.0.2", "rss": "1.2.2", - "sanitize-html": "2.7.0", + "sanitize-html": "2.7.1", "semver": "7.3.7", "serve-favicon": "2.5.0", "sharp": "0.30.7", From 89173f17cab6f6447647e5a3d8609f97c09084d1 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 29 Jul 2022 11:14:15 -0400 Subject: [PATCH 9/9] fix: #10798, logic error in COEP header; helmet config --- src/webserver.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webserver.js b/src/webserver.js index 72cfe2e1f1..3fd24b582b 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -194,7 +194,7 @@ function setupHelmet(app) { referrerPolicy: { policy: 'strict-origin-when-cross-origin' }, }; - if (meta.config['cross-origin-embedder-policy']) { + if (!meta.config['cross-origin-embedder-policy']) { options.crossOriginEmbedderPolicy = false; }