yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-28 19:34:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 114 Branches 486 Tags
Commit Graph

176 Commits

Author SHA1 Message Date
Jim Laurie
4543fd017d Update user API with queries 2017-11-29 17:09:19 +01:00
Aurelsicoko
191092fca9 Redirect CM action to plugin's controller for User plugin 2017-11-29 16:10:13 +01:00
Aurelsicoko
8f8fa6b158 Update doc and generated template 2017-11-29 15:46:28 +01:00
cyril lopez
7afb425688 Fix query bookshelf and modify init role file 2017-11-29 15:42:11 +01:00
cyril lopez
22b525b04e Fix init roles permissions when starting app for the first time 2017-11-28 16:37:23 +01:00
Jim Laurie
b633558c6e Use query User fetch fetchAll 2017-11-28 10:51:03 +01:00
cyril lopez
c7b8dec855 Update branch 
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
 2017-11-27 17:51:46 +01:00
cyril lopez
01af64d709 Handle update role 2017-11-27 17:50:51 +01:00
cyril lopez
1177b1a343 Handle delete role 2017-11-27 17:02:45 +01:00
cyril lopez
b3574dee6e Handle create role 2017-11-27 16:49:56 +01:00
Jim Laurie
637fb86670 Fix conflict 2017-11-27 16:48:49 +01:00
Jim Laurie
ee1ece28d8 Use request route to detect current action 2017-11-27 16:47:16 +01:00
cyril lopez
1fe2ffdbf8 Get roles (frontend and backend) 2017-11-27 16:04:57 +01:00
Jim Laurie
a0af2cdd4c Fix PR feedback 2017-11-20 14:35:24 +01:00
cyril lopez
804adb93ef Add admin folder to email plugin to majke the admin works (TEMPORARY FIX) 2017-11-17 17:49:50 +01:00
Jim Laurie
4d91111890 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-11-17 16:48:11 +01:00
cyril lopez
a6cecb0e3e Algo diff between objects 2017-11-17 16:36:57 +01:00
Jim Laurie
cf4a506ed1 Encrypt password on user update 2017-11-17 16:05:02 +01:00
cyril lopez
1b9250f511 Write roles.sjon file 2017-11-17 14:22:59 +01:00
cyril lopez
d33341d0dc Fix design and generatePermissions service 2017-11-17 12:14:12 +01:00
Jim Laurie
45da41ce11 Update user generated API 2017-11-17 12:05:03 +01:00
cyril lopez
c17adfe0d8 Change permissions data format 2017-11-16 17:59:41 +01:00
Jim Laurie
f10bd4a936 Use db users for login 2017-11-16 14:29:49 +01:00
Jim Laurie
b0a2b61be4 Register new user with hashed password 2017-11-16 14:12:03 +01:00
Jim Laurie
4ad44f016b Init user models and fix api prefix 2017-11-14 11:11:22 +01:00
cyril lopez
2ccfd4e8b5 Generate plugin users-permissions and add it to strapi-packages 2017-11-06 11:14:43 +01:00