94 Commits

Author	SHA1	Message	Date
EpicUsaMan	82f83260e9	Fix after pull request review	2019-02-06 21:57:50 +02:00
EpicUsaMan	327f5f9d4e	Cannot send email because options.to is undefined ... Currently user doesn't have property email, but have attributes object with email property inside.	2019-02-03 02:06:30 +02:00
Aurélien Georget	f534340ca2	Add listeners to events	2019-01-18 16:08:15 +01:00
ByoungYong Kim	fa2c6f37aa	Merge branch 'master' into fix/reattempt-1851	2018-11-17 20:27:08 +01:00
aDeve	429973f814	code review : remove longline, and invers logic condition	2018-11-02 11:47:04 +01:00
aDeve	f39e917ab1	fix #2108 : handle redirect after reset password	2018-10-31 17:36:00 +01:00
Benjamin Devaublanc	0383c4a6ba	Check if user exists before testing user.confirmed	2018-10-23 18:49:49 +02:00
Benjamin Devaublanc	a468f82da0	Fix error 500 when user trying to signin with bad credentials	2018-10-23 13:17:27 +02:00
ByoungYong Kim	a51b030e82	Made hold public base url and Auth controller utilize the value.	2018-10-09 13:03:59 +02:00
ByoungYong Kim	1c7102381d	Using optional proxy config to generate url for and	2018-10-09 11:09:34 +02:00
Jim LAURIE	d2eb881ca8	Merge branch 'master' into master	2018-09-10 17:38:12 +02:00
Jim LAURIE	34124bd6a3	Check user exist before user is blocked	2018-09-05 11:14:03 +02:00
Jim LAURIE	3a396972f0	Fix #1882	2018-09-03 14:19:51 +02:00
Jim LAURIE	7fdccc62ee	PR feedback	2018-08-23 18:28:13 +02:00
Jim LAURIE	f27b2ae2f6	Merge branch 'master' into email-validation	2018-08-21 11:54:22 +02:00
Jim LAURIE	eec423a2cd	Add confirmation email	2018-08-08 17:57:02 +02:00
Jim LAURIE	3f2576cb68	Can block a user	2018-08-06 17:46:58 +02:00
Anshul Kushwaha	18e8d69775	Lowercase email on local auth register	2018-07-13 20:29:41 +05:30
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	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
Jim Laurie	489aefba06	Rename role registered to authenticated	2018-03-14 16:56:12 +01:00
Jim Laurie	88afad1502	Use default role on register action	2018-03-12 16:06:54 +01:00
Aurelsicoko	85fb0f5919	Fix non-polymorphic relations in strapi-bookshelf	2018-02-28 18:10:30 +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
M1chaelTran	1d24e2b873	close #552	2018-02-03 00:30:01 +11: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	7f78cc9f84	Change data format email template	2018-01-26 10:18:36 +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	cf1cb7050b	Resolve conflicts and disallow to edit and remove default roles	2018-01-24 11:52:09 +01:00