yujunjun/strapi

mirror of https://github.com/strapi/strapi.git synced 2025-08-28 02:35:55 +00:00

History

Jim Laurie a6e78f023b Fix conflicts

2018-01-23 10:55:57 +01:00

..

Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs

2018-01-18 13:45:46 +01:00

Fix conflicts

2018-01-23 10:55:57 +01:00

Fix conflicts

2018-01-23 10:55:57 +01:00

Fix conflicts

2018-01-23 10:55:57 +01:00

Add unique email restriction on provider and local register

2018-01-15 17:58:11 +01:00

Fix conflicts

2018-01-23 10:55:57 +01:00

.editorconfig

Generate plugin users-permissions and add it to strapi-packages

2017-11-06 11:14:43 +01:00

.gitattributes

Generate plugin users-permissions and add it to strapi-packages

2017-11-06 11:14:43 +01:00

.gitignore

Generate advanced configs

2018-01-15 15:01:21 +01:00

.npmignore

Add npmignore

2017-12-08 17:32:34 +01:00

package.json

Merge branch 'master' into auth-provider/update-user-models

2018-01-23 10:45:26 +01:00

README.md

Generate plugin users-permissions and add it to strapi-packages

2017-11-06 11:14:43 +01:00

README.md

Strapi plugin