972 Commits

Author	SHA1	Message	Date
Jim Laurie	b54a2e087c	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-04 16:51:32 +01:00
Jim Laurie	df25e9dd2a	Generate uuid for jwt encryption	2017-12-04 16:43:24 +01:00
cyril lopez	4bab690f5c	Fix conflict	2017-12-04 15:52:44 +01:00
cyril lopez	6be459cf33	Fix css	2017-12-04 15:50:46 +01:00
Jim Laurie	bb00db7a44	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-04 15:49:49 +01:00
Jim Laurie	6eb4a5cb77	Fix user update encrypted password	2017-12-04 15:35:45 +01:00
Aurelsicoko	ef99f5095c	Build plugin email	2017-12-04 15:23:35 +01:00
cyril lopez	4cb45e48be	Fix design	2017-12-04 15:03:53 +01:00
Aurelsicoko	42af4a9aaa	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-04 14:30:31 +01:00
Aurelsicoko	2b86bde1b4	Fix build due to layout	2017-12-04 14:29:16 +01:00
Jim Laurie	f852a732a3	Review email reset password template	2017-12-04 14:11:00 +01:00
Jim Laurie	2c43a856ce	Catch email error forgot password	2017-12-04 14:00:09 +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
cyril lopez	046574fb45	Created InstallPluginPage container	2017-12-02 13:37:58 +01:00
cyril lopez	86a5401680	Fix deleting users associated to a role	2017-12-01 16:21:13 +01:00
Jim Laurie	fab65fdd0b	Fix conflict	2017-12-01 16:08:27 +01:00
Jim Laurie	a1ea5a2777	Link user to role	2017-12-01 16:06:16 +01:00
cyril lopez	46498ca2d7	Prevent from searching admin users	2017-12-01 15:53:54 +01:00
cyril lopez	eed26aeef7	Prevent plugins to execute the bootstrap file (frontend) if the plugin users-permissions is in the project or if the user is not logged in	2017-12-01 15:45:11 +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
cyril lopez	70b450f206	Allow displaying several bounded route	2017-12-01 10:26:06 +01:00
cyril lopez	d353690191	Created BoundRoute component	2017-11-30 18:07:30 +01:00
Jim Laurie	7dc3dd9cde	Get role with users	2017-11-30 16:52:28 +01:00
Jim Laurie	75ca6fa713	Fix conflicts	2017-11-30 16:41:39 +01:00
cyril lopez	ad9b39e164	Add handler to get the plugins routes	2017-11-30 16:34:43 +01:00
cyril lopez	6478d87a6f	Fix conflict	2017-11-30 15:51:19 +01:00
cyril lopez	0c127fa555	Fix design	2017-11-30 15:46:34 +01:00
cyril lopez	f6acc00875	Finish design and dynamic show policies section	2017-11-30 15:12:42 +01:00
cyril lopez	0866a5e484	Finish select policy dynamic	2017-11-30 15:01:19 +01:00
Jim Laurie	95607dc7ed	Load bookshelf plugin model if not apis	2017-11-30 13:57:47 +01:00
Jim Laurie	0655833da9	Add users count by role	2017-11-30 12:27:04 +01:00
cyril lopez	8e94fad183	Design Policies component and show route dynamic	2017-11-30 12:10:23 +01:00
cyril lopez	f923a46177	Fetch policies for EditPage container	2017-11-30 11:07:54 +01:00
cyril lopez	a7b56b484f	Fix conflict	2017-11-29 19:00:51 +01:00
cyril lopez	66c0a19b4f	Add selectAll to controller component	2017-11-29 18:51:56 +01:00
Jim Laurie	44cab72a96	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-11-29 18:46:54 +01:00
Jim Laurie	72d4ebf3a9	Add get policy functions	2017-11-29 18:45:51 +01:00
Aurelsicoko	21011eb010	Fix search input icon and blank line in plugin' permissions row	2017-11-29 17:18:08 +01:00
Jim Laurie	4543fd017d	Update user API with queries	2017-11-29 17:09:19 +01:00
Aurelsicoko	1b4670b719	Make design sharp	2017-11-29 17:08:27 +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
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
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
cyril lopez	0af0b27456	Change input search user behaviour	2017-11-29 12:36:35 +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