29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Jim Laurie	3296e9772d	All user API services use queries	2017-11-29 18:24:50 +01:00
Aurelsicoko	118c31245c	Add REPL strapi console command	2017-11-29 17:34:52 +01:00
Aurelsicoko	21011eb010	Fix search input icon and blank line in plugin' permissions row	2017-11-29 17:18:08 +01:00
Aurelsicoko	77f7dda9b1	Increase font-weight link section	2017-11-29 17:10:28 +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	d620a0745d	Remove routing policy from /models route	2017-11-29 16:13:27 +01:00
Aurelsicoko	191092fca9	Redirect CM action to plugin's controller for User plugin	2017-11-29 16:10:13 +01:00
cyril lopez	b4a6336f14	Fix typo in request helper	2017-11-29 15:55:32 +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