158 Commits

Author	SHA1	Message	Date
Jim LAURIE	e97fa20ba3	Merge branch 'master' into master	2018-08-21 11:25:22 +02:00
Chris Dekker	96d1eeb70b	Fix for issue https://github.com/strapi/strapi/issues/1589	2018-08-16 14:17:54 +02:00
Jim LAURIE	3f2576cb68	Can block a user	2018-08-06 17:46:58 +02:00
Kati Frantz	3ea2c2023f	update ctx.request.body to be ctx.request.body.providers, to ensure only permissions are saved to database with no extra keys	2018-07-05 09:57:42 +01:00
Jim Laurie	1c3e6a4664	Update comment on reset password	2018-06-14 17:20:45 +02:00
Jim Laurie	ad815eae20	Fix reset password SQL fix #1351	2018-06-14 17:15:49 +02:00
Jim Laurie	4d47d65c6d	Fix default role provider and create user fix #1212	2018-06-12 19:19:10 +02:00
soupette	e7357e025c	Handle delete many with models from users-permissions	2018-06-06 16:20:52 +02:00
Jim LAURIE	a9d725c74c	Merge branch 'master' into third-party-windows-auth	2018-05-31 14:54:51 +02:00
Marco Stephan	10b0bbffad	Fix third party authenticators always disabled on windows	2018-05-11 22:18:02 +02:00
soupette	68504fbe16	Add eslint to users-permissions backend	2018-04-30 18:26:56 +02:00
soupette	6b3e3d472f	Improve errors notifications	2018-04-24 11:45:09 +02:00
Aurélien GEORGET	11c68bebf2	Update User.js	2018-03-19 17:31:04 +01: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	88afad1502	Use default role on register action	2018-03-12 16:06:54 +01:00
Jim Laurie	9b7a216411	Add default role in advanced settings	2018-03-12 15:56:25 +01:00
Aurelsicoko	85fb0f5919	Fix non-polymorphic relations in strapi-bookshelf	2018-02-28 18:10:30 +01:00
Jim Laurie	cf029dac07	Create db entry on upload and get uploads	2018-02-19 15:41:26 +01:00
Jim Laurie	c52fe7165b	Fix get email settings reset password	2018-02-13 15:59:06 +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
Jim LAURIE	08d74e1515	Merge branch 'master' into fix/boot	2018-02-09 17:02:18 +01:00
Aurelsicoko	46a64b449f	Update default hook timeout to 3000 milliseconds	2018-02-09 16:36:23 +01:00
Jim Laurie	05804c391a	Update user info in JWT ... Just set user id in auth jwt fix #528	2018-02-08 14:37:54 +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
M1chaelTran	1d24e2b873	close #552	2018-02-03 00:30:01 +11:00
Jim Laurie	a8c59f999a	Fix user update via API and content-type-builder	2018-02-02 12:59:34 +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	0164a76d4c	Fix disable register and provider login	2018-01-29 13:12:49 +01:00
Jim LAURIE	6ac7692214	Merge branch 'master' into update-email-template	2018-01-26 11:30:58 +01:00
Jim LAURIE	75de294ef5	Merge branch 'master' into fix-unique-email-user	2018-01-26 11:18:07 +01:00
Jim Laurie	7f78cc9f84	Change data format email template	2018-01-26 10:18:36 +01:00
Jim Laurie	7c16f512e6	Fix unique email for user API	2018-01-26 09:37:24 +01:00
Aurelsicoko	8a66873405	Display better error message & lock fields	2018-01-25 18:12:29 +01:00
Jim LAURIE	319f17be4d	Merge branch 'master' into fix-providers	2018-01-25 16:01:20 +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
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	64d3149876	Fix PR feedback	2018-01-25 11:53:22 +01:00
cyril lopez	3a02cd9ac4	Fix error when trying to log with a provider when already used another one ... The error occured when login with GitHub and then trying to login with FB. It returned a 500 so to avoid 500 error I catched the error and return a badRequest	2018-01-25 11:52:17 +01:00
Jim Laurie	2e1283f117	Fix conflict	2018-01-25 10:02:17 +01:00
Jim Laurie	2b57c3e6de	Move grant middleware in controller action	2018-01-25 09:59:24 +01:00
Jim Laurie	a2d7ffce74	User service to template email	2018-01-25 08:38:46 +01:00
Aurelsicoko	ed696f70a0	Refetch roles after delete	2018-01-24 13:51:22 +01:00
Aurelsicoko	cf1cb7050b	Resolve conflicts and disallow to edit and remove default roles	2018-01-24 11:52:09 +01:00
Aurelsicoko	f2bff7f17d	Return an error if a non-admin user try to connect to the admin	2018-01-24 11:38:42 +01:00
Aurelsicoko	8f85d85349	Improve roles in database to work with Bookshelf	2018-01-23 18:54:17 +01:00