Merge branch 'rte-rework' of ssh://github.com/coralproject/talk into rte-rework

This commit is contained in:
Chi Vinh Le
2018-03-21 17:43:17 +01:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -11,7 +11,7 @@ plugin:
- Client
---
Enables sign-in via Facebook via the server side passport middleware.
Enables sign-in via Google+ via the server side passport middleware.
You will need to enable the Google+ API in the dashboard and create credentials
for a new OAuth client ID web application. The authorized JavaScript origin
@@ -26,4 +26,4 @@ Configuration:
the [Google API Console](https://console.developers.google.com/apis/).
- `TALK_GOOGLE_CLIENT_SECRET` (**required**) - The Google OAuth2 client ID for
your Google login web app. You can learn more about getting a Google Client
ID at the [Google API Console](https://console.developers.google.com/apis/).
ID at the [Google API Console](https://console.developers.google.com/apis/).
+1 -1
View File
@@ -80,7 +80,7 @@ router.post('/password/reset', async (req, res, next) => {
token,
},
subject: 'Password Reset',
to: email,
email,
});
}