yujunjun/strapi

mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00

History

cyril lopez 804adb93ef Add admin folder to email plugin to majke the admin works (TEMPORARY FIX)

2017-11-17 17:49:50 +01:00

..

Fix conflict

2017-11-17 17:22:41 +01:00

Add admin folder to email plugin to majke the admin works (TEMPORARY FIX)

2017-11-17 17:49:50 +01:00

Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions

2017-11-17 16:48:11 +01:00

Use db users for login

2017-11-16 14:29:49 +01:00

Add admin folder to email plugin to majke the admin works (TEMPORARY FIX)

2017-11-17 17:49:50 +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 plugin users-permissions and add it to strapi-packages

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

package.json

Fix design and generatePermissions service

2017-11-17 12:14:12 +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