693 Commits

Author	SHA1	Message	Date
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
Aurelsicoko	b45f6777a6	Add translation for no admin access	2018-01-25 13:59:50 +01:00
cyril lopez	5e275e101d	Display icon trash for deleting a role	2018-01-25 13:59:05 +01:00
cyril lopez	7da53f6fe5	Add important note to PopUpform ... Noteon the switch statement about what the user has to set in its provider s configurations	2018-01-25 13:45:29 +01:00
cyril lopez	c4dac29bf6	Fix conflict	2018-01-25 13:43:07 +01:00
Aurelsicoko	add54f8ecb	Remove variables.json file	2018-01-25 13:38:18 +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
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
Aurelsicoko	462b44a759	Fix PG queries	2018-01-25 11:19:53 +01:00
Aurelsicoko	04c3518dbc	Remove unnecessary actions.json file from repository	2018-01-25 10:51:12 +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	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	db0c1a007e	Add info input in providers	2018-01-24 19:12:13 +01:00
Aurelsicoko	cc1e8e20aa	Don't execute the action again if there is a policy	2018-01-24 19:00:12 +01:00
cyril lopez	2031b8c9d7	Set user role when registering with a provider	2018-01-24 17:31:22 +01:00
Aurelsicoko	ed696f70a0	Refetch roles after delete	2018-01-24 13:51:22 +01:00
cyril lopez	8ef21b0a49	Allow editing redirect_uri	2018-01-24 13:02:16 +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	0a62003af6	Fix plugin load due to autoReload	2018-01-24 11:06:24 +01:00
Aurelsicoko	0b771f425d	Fix delete role with Bookshelf	2018-01-23 19:08:36 +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
cyril lopez	06ab6ba8cd	Add translations for twitter	2018-01-23 16:43:16 +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	9ddd7f12a8	Fix missing save conflict	2018-01-23 11:32:40 +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	33437439a6	Fix missing koa grant dep	2018-01-23 10:43:49 +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
Jim LAURIE	e6eff3b98e	Merge branch 'master' into add-repo-link	2018-01-22 16:04:37 +01:00
cyril lopez	1ffedf9726	Update branch ... Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs-front	2018-01-22 13:12:16 +01:00
cyril lopez	8ca48eec29	Remove useless render functions	2018-01-22 13:10:58 +01:00
cyril lopez	2b099e3a2f	Handle form errors for email-templates	2018-01-22 12:25:50 +01:00
cyril lopez	46ecdd1e17	Handle formValidation for providers	2018-01-22 12:05:22 +01:00
cyril lopez	88204154f9	Update list when PUT providers	2018-01-22 11:00:41 +01:00
cyril lopez	e425125f82	Put providers	2018-01-22 10:23:04 +01:00
Aurelsicoko	9daf29be78	Be able to retrieve role data with populate	2018-01-19 17:57:10 +01:00
Jim LAURIE	bf69ea7de9	Merge branch 'master' into alpha.8.3	2018-01-19 17:55:24 +01:00
cyril lopez	9b1347d092	Add link to documentation for templating emails	2018-01-19 17:43:00 +01:00