122 Commits

Author	SHA1	Message	Date
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
cyril lopez	6050643757	Update branch ... Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs-front	2018-01-23 16:00:56 +01:00
cyril lopez	db23c22ee4	Update branch ... Merge branch 'auth-provider/configs' of github.com:strapi/strapi into auth-provider/configs-front	2018-01-23 15:58:48 +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
Luca	202d5d97c4	Merge branch 'master' into master	2018-01-23 14:02:31 +01:00
Luca	adc532cf74	feat(plugin-users-permissions): lowercase email	2018-01-23 13:35:51 +01:00
Jim Laurie	a6e78f023b	Fix conflicts	2018-01-23 10:55:57 +01:00
Jim LAURIE	eb1d1645fd	Merge branch 'master' into auth-provider/update-user-models	2018-01-23 10:45:26 +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
cyril lopez	e425125f82	Put providers	2018-01-22 10:23:04 +01:00
cyril lopez	630e06d7fa	Get providers	2018-01-19 15:14:51 +01:00
cyril lopez	11c5905d25	form to edit email templates	2018-01-19 13:34:55 +01:00
Luca Perret	0641c7b279	fix(plugin-users-permissions): undefined value	2018-01-18 23:27:59 +01:00
Luca Perret	2816863cfc	fix(plugin-users-permissions): auth register lower case identifier	2018-01-18 23:27:59 +01:00
Luca Perret	d0d70976c9	feat(plugin-users-permissions): auth email case-insensitive	2018-01-18 23:27:59 +01:00
cyril lopez	97d6f49f93	Update branch ... Merge branch 'auth-provider/configs' of github.com:strapi/strapi into auth-provider/configs-front	2018-01-18 16:25:31 +01:00
cyril lopez	c453954f3b	Add submit dynamic	2018-01-18 16:23:31 +01:00
Jim Laurie	f9920a4739	Disable local provider	2018-01-18 16:01:52 +01:00
Jim Laurie	6ae2f6dfee	Add unique email verification on user update	2018-01-18 14:10:26 +01:00
cyril lopez	286c519641	Update branch ... Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs-front	2018-01-18 13:46:22 +01:00
Jim Laurie	cf6b240451	Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs	2018-01-18 13:45:46 +01:00
Aurelsicoko	fa8976c98f	Fix infinite login	2018-01-18 11:13:44 +01:00
Jim Laurie	b2e07979c7	Template forgot password email object	2018-01-18 10:03:29 +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	b84976fbbd	Improve init action to check if there is an administrator	2018-01-17 19:22:35 +01:00
Aurelsicoko	4aa28a196e	[WIP] Read and update roles & permissions using database	2018-01-17 18:50:12 +01:00
Jim Laurie	1bcae6c73e	Add unique email restriction on provider and local register	2018-01-15 17:58:11 +01:00
Jim Laurie	1b2897bd83	Get and update advanced settings	2018-01-15 16:23:54 +01:00
Jim Laurie	072dc10137	Add registration restriction on provider and local register	2018-01-15 15:19:59 +01:00
Jim Laurie	3a9cb9b453	Use email templte config reset password	2018-01-15 14:50:53 +01:00
Jim Laurie	7ab44d4b0f	Update email template config	2018-01-15 12:05:01 +01:00
Jim Laurie	24d5a5116f	Get email template	2018-01-15 11:59:10 +01:00
cyril lopez	c838b90e21	Add serverRestart to users-permissions	2018-01-15 11:07:40 +01:00
Jim Laurie	6e44e2e274	Add provider connection	2018-01-12 15:20:13 +01:00
cyril lopez	2af14f24c5	Throw error when trying to get /user/me with no headers	2018-01-11 16:24:16 +01:00