Merge remote-tracking branch 'origin/master' into develop

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

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.
 

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());
 		});