56 Commits

Author	SHA1	Message	Date
Jim Laurie	832617159d	Fix auto set config if doent exist	2017-12-12 15:13:27 +01:00
Jim Laurie	a5ef1aa0ca	Fix user fetch service with id	2017-12-11 12:31:26 +01:00
Jim Laurie	5f4a5971d7	Last fix PR	2017-12-11 11:14:07 +01:00
cyril lopez	3da6faac05	Fix feedback PR	2017-12-08 14:40:42 +01:00
cyril lopez	4074846b5b	Refacto service	2017-12-08 10:42:45 +01:00
cyril lopez	3ebd86b2e1	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-07 18:42:40 +01:00
cyril lopez	f471a98f90	Fix manage user role bookshelf	2017-12-07 18:40:55 +01:00
cyril lopez	8d6cace469	Refacto InputSearch	2017-12-07 18:31:19 +01:00
Jim Laurie	729eea32c7	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-07 18:31:16 +01:00
cyril lopez	b01abf91f1	Add apiRoutes and fix feedback PR	2017-12-07 18:16:18 +01:00
Jim Laurie	5b4f91dcff	Fix some PR feedback	2017-12-07 18:16:15 +01:00
cyril lopez	957b92692a	Sort functions by name	2017-12-07 15:27:11 +01:00
cyril lopez	a19e6eaf15	Fix roles.json bug	2017-12-07 10:16:36 +01:00
cyril lopez	59872ac890	Handle backend errors in ctm	2017-12-06 15:11:55 +01:00
Jim Laurie	4e6339da1e	Fix delete user from group	2017-12-05 16:44:54 +01:00
Aurelsicoko	110c209431	Be able to create an user from the Content Manager	2017-12-05 15:28:31 +01:00
Jim Laurie	a098244281	Fix permission on bootstrap	2017-12-04 17:45:58 +01:00
Jim Laurie	ea8b7a8c5c	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-04 17:41:39 +01:00
cyril lopez	65264cf938	Fix design	2017-12-04 17:32:45 +01:00
Jim Laurie	df25e9dd2a	Generate uuid for jwt encryption	2017-12-04 16:43:24 +01:00
Jim Laurie	6eb4a5cb77	Fix user update encrypted password	2017-12-04 15:35:45 +01:00
Jim Laurie	74164aa38a	Remove log and fix email reset password 404	2017-12-04 13:40:07 +01:00
cyril lopez	521b627fd8	Created plugin card component	2017-12-02 16:10:18 +01:00
Jim Laurie	a1ea5a2777	Link user to role	2017-12-01 16:06:16 +01:00
Jim Laurie	034207a326	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-01 11:16:08 +01:00
Jim Laurie	7dc3dd9cde	Get role with users	2017-11-30 16:52:28 +01:00
cyril lopez	ad9b39e164	Add handler to get the plugins routes	2017-11-30 16:34:43 +01:00
Jim Laurie	0655833da9	Add users count by role	2017-11-30 12:27:04 +01:00
cyril lopez	a7b56b484f	Fix conflict	2017-11-29 19:00:51 +01:00
Jim Laurie	72d4ebf3a9	Add get policy functions	2017-11-29 18:45:51 +01:00
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