235 Commits

Author	SHA1	Message	Date
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
Aurelsicoko	2b86bde1b4	Fix build due to layout	2017-12-04 14:29:16 +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	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
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	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	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
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
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