238 Commits

Author	SHA1	Message	Date
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
cyril lopez	9df31150d2	Fix design	2017-11-29 10:29:12 +01:00
Aurelsicoko	bfc0f69e6d	Ignore roles.json	2017-11-28 16:47:41 +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
Aurelsicoko	db5e72f4e3	Fix design	2017-11-28 16:40:55 +01:00
cyril lopez	272f2689a5	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-11-28 16:38:31 +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	4a510ac729	Fix font-weight on roles list	2017-11-28 16:24:28 +01:00
Aurelsicoko	3cf999c8a6	Add layout user and apply design change	2017-11-28 16:20:39 +01:00
Aurelsicoko	5d6f035384	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-11-28 16:10:03 +01:00
Aurelsicoko	b63cd80a13	Add type email & password, and fix layout system	2017-11-28 16:01:50 +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	2a27b915f8	Fix design	2017-11-28 15:04:02 +01:00
Jim Laurie	aecbbcf3ba	Handle default connection for mongoose	2017-11-28 14:28:30 +01:00
cyril lopez	4d56b185bf	Fix login error bug	2017-11-28 14:12:03 +01:00
Aurelsicoko	362f7badb0	Add type password	2017-11-28 13:51:50 +01:00
cyril lopez	19b06da90e	Add logout	2017-11-28 13:24:26 +01:00
Aurelsicoko	703223687f	Remove URL attributes and try new load attempt if plugin fails to load	2017-11-28 12:40:39 +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
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
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
cyril lopez	1177b1a343	Handle delete role	2017-11-27 17:02:45 +01:00
Jim Laurie	f0a766388f	By pass permissions for app owner	2017-11-27 16:59:53 +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