From 659cfe853d7c8bd46f9b888344f7e3ddf9cb627e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 8 Aug 2022 15:23:30 -0400 Subject: [PATCH 1/2] chore: update to new transifex project url --- README.md | 4 ++-- public/language/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0cb3c44eb1..ec84b1303e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Our minimalist "Persona" theme gets you going right away, no coding experience r * If you are a developer, feel free to check out the source and submit pull requests. We also have a wide array of [plugins](http://community.nodebb.org/category/7/nodebb-plugins) which would be a great starting point for learning the codebase. * If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extension of the base templates as well as styling via LESS or CSS. NodeBB's base theme utilizes [Bootstrap 3](http://getbootstrap.com/) but themes can choose to use a different framework altogether. -* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://www.transifex.com/projects/p/nodebb/) for internationalization. +* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://explore.transifex.com/nodebb/nodebb/) for internationalization. * Please don't forget to **like**, **follow**, and **star our repo**! Join our growing [community](http://community.nodebb.org) to keep up to date with the latest NodeBB development. ## Requirements @@ -76,7 +76,7 @@ Interested in a sublicense agreement for use of NodeBB in a non-free/restrictive * [Demo](https://try.nodebb.org) * [Developer Community](http://community.nodebb.org) * [Documentation & Installation Instructions](http://docs.nodebb.org) -* [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/) +* [Help translate NodeBB](https://explore.transifex.com/nodebb/nodebb/) * [NodeBB Blog](http://blog.nodebb.org) * [Premium Hosting for NodeBB](http://www.nodebb.org/ "NodeBB") * Unofficial IRC community – channel `#nodebb` on Libera.chat diff --git a/public/language/README.md b/public/language/README.md index a578e1e68b..26c4db1304 100644 --- a/public/language/README.md +++ b/public/language/README.md @@ -3,7 +3,7 @@ The files here are read-only and overwritten daily (if there are changes) by the helper bot [Misty](https://github.com/nodebb-misty). -Our localisation efforts are handled via [our Transifex Project](https://www.transifex.com/nodebb/nodebb/), +Our localisation efforts are handled via [our Transifex Project](https://explore.transifex.com/nodebb/nodebb/), and any pull requests made to this directory will be automatically closed because localisations can go out-of-sync when edited directly. From 961be707258c627006fa05b264cbcd5e7ecd883d 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 Aug 2022 18:26:46 -0400 Subject: [PATCH 2/2] fix test on redis --- test/socket.io.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/socket.io.js b/test/socket.io.js index d56a5b9a82..a4db2b7aaa 100644 --- a/test/socket.io.js +++ b/test/socket.io.js @@ -688,6 +688,8 @@ describe('socket.io', () => { const uid = await user.create({ username: 'forceme', password: '123345' }); await socketAdmin.user.forcePasswordReset({ uid: adminUid }, [uid]); const pwExpiry = await user.getUserField(uid, 'passwordExpiry'); + const sleep = util.promisify(setTimeout); + await sleep(500); assert(pwExpiry > then && pwExpiry < Date.now()); });