191 Commits

Author	SHA1	Message	Date
Jim Laurie	8cd33563ae	Harmonize model templates	2018-05-14 12:05:09 +02:00
cyril lopez	1f019c60c3	Merge branch 'master' into eslint	2018-05-14 11:50:32 +02:00
Aurelsicoko	13209fd3a5	Fixes #1134	2018-05-08 17:54:23 +02:00
Jim LAURIE	c09f5138a2	Merge branch 'master' into eslint	2018-05-07 16:03:35 +02:00
Jim LAURIE	d0b9233b17	Merge branch 'master' into fix/736	2018-05-07 15:27:41 +02:00
Aurelsicoko	451ad266fb	Keep first set permissions & remove duplicate	2018-05-03 16:26:57 +02:00
Aurelsicoko	f62c5f52fc	Remove duplicate permissions	2018-05-02 11:40:42 +02:00
soupette	68504fbe16	Add eslint to users-permissions backend	2018-04-30 18:26:56 +02:00
Aurelsicoko	dffbf3bbb3	Concat promise to return a single array	2018-04-27 15:48:52 +02:00
Jim Laurie	79ddc27cb1	U&P setup in bookshelf and handle oneToMany relation	2018-04-24 14:29:28 +02:00
Jim Laurie	8191c43ce5	Create tables is not exist instead of log queries	2018-04-23 16:09:01 +02:00
Aurelsicoko	7149cfa36e	Avoid badRequest when an API hasn't routes	2018-04-23 14:39:27 +02:00
Aurelsicoko	61fb2dec45	Avoid random restart on permission update	2018-04-23 14:21:24 +02:00
Juampy	32095d08c5	Fix invalid timestamp default values for MySQL 5.7	2018-04-18 19:01:19 +02:00
Jim Laurie	489aefba06	Rename role registered to authenticated	2018-03-14 16:56:12 +01:00
Jim Laurie	72877c3074	Rename Guest to Public role	2018-03-12 16:37:20 +01:00
Jim Laurie	2b0ab41a66	Add registered role and fix update role name & description	2018-03-12 14:04:43 +01:00
Jim LAURIE	f0706d474c	Merge branch 'master' into alpha.10.3	2018-02-26 18:15:49 +01:00
Jim Laurie	443d6b81fb	Fix remove user on role update	2018-02-24 17:42:33 +01:00
Jim Laurie	de3da8eaf7	Fix conflicts	2018-02-19 19:56:23 +01:00
Jim Laurie	9ef00e217d	Delete file upload	2018-02-19 16:00:37 +01:00
Jim Laurie	00230f0f8f	Hot fix provider login ... Co-authored-by: soupette <cyril.lpz@gmail.com>	2018-02-14 17:02:44 +01:00
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