yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 08:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:strapi/strapi into ctm/improve-listview

Browse Source
This commit is contained in:
soupette 2020-01-13 11:40:16 +01:00
commit f2918e1c37
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/3.0.0-beta.x/getting-started/install-requirements.md
View File

@ -15,7 +15,7 @@ You can also use **yarn** if you want [here](https://yarnpkg.com/en/docs/getting
Strapi is supporting multiple databases. If you are using the `--quickstart` or if you manually chose the `SQLite` database, you will not need to install any database on you local computer. Strapi is supporting multiple databases. If you are using the `--quickstart` or if you manually chose the `SQLite` database, you will not need to install any database on you local computer.
If you want to use a custom database, here is versions you will have to respect: If you want to use a custom database, here are the versions you will have to respect:
- **MongoDB** >= 3.6 - **MongoDB** >= 3.6
- **MySQL** >= 5.6 - **MySQL** >= 5.6

8
docs/3.0.0-beta.x/migration-guide/migration-guide-beta.17-to-beta.18.md
View File

@ -496,7 +496,7 @@ RENAME TABLE groups_old_table_name TO components_new_table_name;
**2. Change the `collectionName` of the component** **2. Change the `collectionName` of the component**
**Before** **Before**
`./components/component.json` `./components/yourcategoryname/yourcomponentname.json`
```json ```json
{ {
@ -506,7 +506,7 @@ RENAME TABLE groups_old_table_name TO components_new_table_name;
``` ```
**After** **After**
`./components/component.json` `./components/yourcategoryname/yourcomponentname.json`
```json ```json
{ {
@ -565,7 +565,7 @@ db.collection.renameCollection('groups_my_group', 'components_my_component');
**3. Change the `collectionName` of the component** **3. Change the `collectionName` of the component**
**Before** **Before**
`./components/component.json` `./components/yourcategoryname/yourcomponentname.json`
```json ```json
{ {
@ -575,7 +575,7 @@ db.collection.renameCollection('groups_my_group', 'components_my_component');
``` ```
**After** **After**
`./components/component.json` `./components/yourcategoryname/yourcomponentname.json`
```json ```json
{ {

6
packages/strapi-plugin-users-permissions/controllers/Auth.js
View File

@ -112,7 +112,7 @@ module.exports = {
formatError({ formatError({
id: 'Auth.form.error.password.local', id: 'Auth.form.error.password.local',
message: message:
'This user never set a local password, please login thanks to the provider used during account creation.', 'This user never set a local password, please login with the provider used during account creation.',
}) })
); );
} }
@ -150,7 +150,7 @@ module.exports = {
); );
} }
// Connect the user thanks to the third-party provider. // Connect the user with the third-party provider.
let user, error; let user, error;
try { try {
[user, error] = await strapi.plugins[ [user, error] = await strapi.plugins[
@ -295,7 +295,7 @@ module.exports = {
name: 'users-permissions', name: 'users-permissions',
}); });
// Find the user user thanks to his email. // Find the user by email.
const user = await strapi const user = await strapi
.query('user', 'users-permissions') .query('user', 'users-permissions')
.findOne({ email }); .findOne({ email });