266 Commits

Author SHA1 Message Date
Jim Laurie
4543fd017d Update user API with queries 2017-11-29 17:09:19 +01:00
cyril lopez
6596e42e0b Handle search user with bookshelf 2017-11-29 16:24:11 +01:00
Aurelsicoko
191092fca9 Redirect CM action to plugin's controller for User plugin 2017-11-29 16:10:13 +01:00
cyril lopez
7afb425688 Fix query bookshelf and modify init role file 2017-11-29 15:42:11 +01:00
Aurelsicoko
c971f9c054 Allow redirect action in CM & harmonize pre/post event with Promises 2017-11-29 15:00:50 +01:00
cyril lopez
47dccaa26b Fix request helper 2017-11-29 12:48:58 +01:00
Aurelsicoko
904484df37 Use state for source and fix create form 2017-11-29 12:24:23 +01:00
cyril lopez
f6d243a4df Fix add header to request helper 2017-11-29 11:43:38 +01:00
cyril lopez
9df31150d2 Fix design 2017-11-29 10:29:12 +01:00
Aurelsicoko
913410a080 Add clean roles.json 2017-11-28 16:47:00 +01:00
Aurelsicoko
611a2e337a Resolve conflicts 2017-11-28 16:43:30 +01:00
cyril lopez
22b525b04e Fix init roles permissions when starting app for the first time 2017-11-28 16:37:23 +01:00
Aurelsicoko
3cf999c8a6 Add layout user and apply design change 2017-11-28 16:20:39 +01:00
cyril lopez
520a2aa543 Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-11-28 16:00:28 +01:00
cyril lopez
341561006c Fix conflict 2017-11-28 15:46:53 +01:00
Jim Laurie
44c511ad50 Update user bookshelf fetch query 2017-11-28 15:32:25 +01:00
cyril lopez
19b06da90e Add logout 2017-11-28 13:24:26 +01:00
Jim Laurie
b633558c6e Use query User fetch fetchAll 2017-11-28 10:51:03 +01:00
Jim Laurie
6fe7dc82cf Add beforeInitialize function for middleware 2017-11-28 10:02:30 +01:00
Jim Laurie
ddcf48d7c4 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-11-28 09:20:07 +01:00
Aurelsicoko
311862dbb1 Handle delete plugin entry using Content Manager 2017-11-27 17:45:21 +01:00
Aurelsicoko
9ebbe42998 Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 2017-11-27 17:27:58 +01:00
Aurelsicoko
eceede450b Handle plugin model in Content Manager 2017-11-27 17:27:16 +01:00
Jim Laurie
f0a766388f By pass permissions for app owner 2017-11-27 16:59:53 +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
cyril lopez
950147901d Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-11-27 14:44:42 +01:00
Aurelsicoko
1c2f625a2b Allow plugin to add link into a specific left menu section 2017-11-27 12:22:20 +01:00
cyril lopez
baee801941 Add searchUsers and created mongoose query 2017-11-27 12:19:36 +01:00
Jim Laurie
5e2748f81f Send 401 if action is not enabled 2017-11-27 12:05:18 +01:00
Jim Laurie
9a801e4ac1 Inject authentication policy 2017-11-27 10:59:24 +01:00
cyril lopez
b00087c157 Delete dynamic (front end) 2017-11-23 18:08:14 +01:00
cyril lopez
38e6df838f Edit role 2017-11-23 17:13:46 +01:00
cyril lopez
f4fbe455b5 Handle front end role post 2017-11-23 12:15:06 +01:00
cyril lopez
97d20d5315 Created handler for POST role 2017-11-23 11:03:26 +01:00
Jim Laurie
ab62578fac Fix API assign 2017-11-21 10:07:49 +01:00
Jim Laurie
156e21f650 Review Auth response 2017-11-20 16:28:50 +01:00
cyril lopez
b4539df31f Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-11-20 14:48:01 +01:00
cyril lopez
be3c4bd812 Refacto login werification 2017-11-20 14:45:27 +01:00
Jim Laurie
7b84df6fbc Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-11-20 14:38:09 +01:00
Jim Laurie
a0af2cdd4c Fix PR feedback 2017-11-20 14:35:24 +01:00
cyril lopez
ac5f20a000 Add reset-password view and fix PR feedbacks 2017-11-20 14:21:08 +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
cyril lopez
a6cecb0e3e Algo diff between objects 2017-11-17 16:36:57 +01:00
cyril lopez
1e5fa88e54 Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-11-17 14:24:31 +01:00
cyril lopez
1b9250f511 Write roles.sjon file 2017-11-17 14:22:59 +01:00
Jim Laurie
3a1bb20f59 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-11-17 11:18:01 +01:00
Jim Laurie
f539eb0e10 Add bootstrap function in plugins 2017-11-17 11:17:20 +01:00
Jim Laurie
cd834d6828 Change email node module 2017-11-16 18:00:15 +01:00