119 Commits

Author	SHA1	Message	Date
Jim Laurie	957e7a08cb	Environment agnostic for users-permissions configs	2018-02-13 15:04:21 +01:00
Jim Laurie	5bf1e51422	Fix conflicts	2018-02-12 13:25:43 +01:00
Aurelsicoko	a07663afe4	Populate type field when creating a role #553	2018-02-06 14:43:26 +01:00
Jim Laurie	244b280919	New format store constructor ... strapi.store(source).get(params) strapi.store(source).set({params, value}) Co-authored-by: Aurelsicoko <aurelsicoko@gmail.com>	2018-02-06 13:10:43 +01:00
Jim LAURIE	dcb2839260	Merge branch 'master' into fix-update-user	2018-02-05 17:09:26 +01:00
Jim LAURIE	5fece61ed9	Fix set params id	2018-02-05 12:41:10 +01:00
Jim Laurie	a8c59f999a	Fix user update via API and content-type-builder	2018-02-02 12:59:34 +01:00
Jørgensen	dffa0b03e3	Merge branch 'master' into master	2018-02-02 08:04:42 +01:00
Jim Laurie	29af75cc51	Use database config for users-permissions plugin ... Delete advanced, grant and email json files Update setter to update data	2018-02-01 18:12:38 +01:00
Jim LAURIE	1dd08597cd	Merge branch 'master' into fix-providers-restrictions	2018-01-31 07:51:24 +01:00
Kristian Frølund	280109c034	Moved user validation logic from JWT service to permissions policy	2018-01-29 19:26:28 +01:00
Jim Laurie	c044b105fc	Fix block provider conditions	2018-01-29 17:12:49 +01:00
Jim Laurie	0164a76d4c	Fix disable register and provider login	2018-01-29 13:12:49 +01:00
Jørgensen	b0c915c34b	Merge branch 'master' into master	2018-01-27 08:09:19 +01:00
Jørgensen	69d6ed748b	Implemented review suggestion.	2018-01-27 08:08:59 +01:00
Jørgensen	3d9ba865f5	Added default options to enable re-use	2018-01-26 07:32:28 +01:00
Aurelsicoko	7862899ed6	Lowercase action to avoid bug with permission	2018-01-25 17:08:39 +01:00
Aurelsicoko	1d98cdd8a4	Assign guest role to user using provider auth	2018-01-25 16:37:35 +01:00
Jim LAURIE	319f17be4d	Merge branch 'master' into fix-providers	2018-01-25 16:01:20 +01:00
Jim Laurie	0e74eafc74	Fix second auth with provider	2018-01-25 15:48:56 +01:00
Aurelsicoko	717b2d07c4	Only create permissions for controller's functions	2018-01-25 15:46:15 +01:00
Jim Laurie	bdc3b273da	Handle if no display name google login	2018-01-25 15:30:57 +01:00
Aurelsicoko	1ac6a56ce0	Resolve conflicts	2018-01-25 15:26:25 +01:00
Jim Laurie	7cddfd9340	Fix get twitter data	2018-01-25 15:04:42 +01:00
Aurelsicoko	a60e13799f	Open route /connect	2018-01-25 14:36:12 +01:00
cyril lopez	c4dac29bf6	Fix conflict	2018-01-25 13:43:07 +01:00
Aurelsicoko	fc21d5f30a	Resolve conflicts	2018-01-25 13:25:09 +01:00
Jim LAURIE	01bb4cd0e2	Remove last else condition	2018-01-25 12:26:09 +01:00
Jim Laurie	64d3149876	Fix PR feedback	2018-01-25 11:53:22 +01:00
Aurelsicoko	462b44a759	Fix PG queries	2018-01-25 11:19:53 +01:00
Jim Laurie	4eb81abe5f	Use async/await provider service	2018-01-25 08:54:17 +01:00
Jim Laurie	a2d7ffce74	User service to template email	2018-01-25 08:38:46 +01:00
cyril lopez	2031b8c9d7	Set user role when registering with a provider	2018-01-24 17:31:22 +01:00
Aurelsicoko	cf1cb7050b	Resolve conflicts and disallow to edit and remove default roles	2018-01-24 11:52:09 +01:00
Aurelsicoko	0a62003af6	Fix plugin load due to autoReload	2018-01-24 11:06:24 +01:00
Aurelsicoko	8f85d85349	Improve roles in database to work with Bookshelf	2018-01-23 18:54:17 +01:00
cyril lopez	9e5d0e991b	Fix provider auth	2018-01-23 17:25:58 +01:00
Aurelsicoko	187f6cb748	Display logs for every missing tables or attributes & update delete/add role feature	2018-01-23 15:38:43 +01:00
Jim Laurie	a6e78f023b	Fix conflicts	2018-01-23 10:55:57 +01:00
Jim Laurie	6b418b1460	Fix PR feedback and add twitter provider	2018-01-23 09:30:25 +01:00
Aurelsicoko	a06336cdbb	Update permissions from UI in database	2018-01-22 18:19:44 +01:00
Aurelsicoko	9daf29be78	Be able to retrieve role data with populate	2018-01-19 17:57:10 +01:00
Jim Laurie	66617e31c8	Merge branch 'auth-provider/update-user-models' of github.com:strapi/strapi into auth-provider/configs	2018-01-18 09:08:27 +01:00
Jim Laurie	7442e01abb	Fix conflict documentation	2018-01-18 08:32:44 +01:00
Aurelsicoko	4b9923b574	Fix typo	2018-01-17 19:00:36 +01:00
Aurelsicoko	d5390fd4aa	Merge branch 'master' of github.com:strapi/strapi into update-roles-models	2018-01-17 18:52:51 +01:00
Aurelsicoko	4aa28a196e	[WIP] Read and update roles & permissions using database	2018-01-17 18:50:12 +01:00
Jim Laurie	ef2be5c6ee	Fix postgres and mysql logs user table creation	2018-01-17 14:32:38 +01:00
Jim Laurie	1bcae6c73e	Add unique email restriction on provider and local register	2018-01-15 17:58:11 +01:00
Jim Laurie	072dc10137	Add registration restriction on provider and local register	2018-01-15 15:19:59 +01:00