yujunjun/strapi

mirror of https://github.com/strapi/strapi.git synced 2025-08-08 00:37:38 +00:00

History

Jim LAURIE ea00d491aa

Merge branch 'master' into fix-update-providers-issue

2018-07-16 16:07:30 +02:00

..

Fix conflict

2018-07-13 12:33:52 +02:00

Handle delete many with models from users-permissions

2018-06-06 16:20:52 +02:00

update ctx.request.body to be ctx.request.body.providers, to ensure only permissions are saved to database with no extra keys

2018-07-05 09:57:42 +01:00

Add email template documentation

2018-01-26 18:04:39 +01:00

middlewares/users-permissions

Move grant middleware in controller action

2018-01-25 09:59:24 +01:00

Front-end config in core-store

2018-06-27 19:00:19 +02:00

Resolve merge

2018-06-13 17:56:41 +02: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

Remove layout.json & add it in .gitignore

2018-05-17 15:12:00 +02:00

.npmignore

Ignore .editorconfig & .gitattributes in npm plugins & admin

2018-05-04 16:47:07 +02:00

package.json

3.0.0-alpha.12.7.1

2018-07-10 18:10:42 +02: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