29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
cyril lopez	47e034fc92	Add advanced.json to .gitignore	2018-01-25 16:43:16 +01:00
Jim LAURIE	2f881274d7	Merge pull request #500 from strapi/fix/overlay-blocker-stm ... Fix/overlay blocker stm	2018-01-25 16:38:14 +01:00
Aurelsicoko	1d98cdd8a4	Assign guest role to user using provider auth	2018-01-25 16:37:35 +01:00
cyril lopez	b88c32f16a	Merge branch 'master' of github.com:strapi/strapi into fix/providers-front	2018-01-25 16:30:50 +01:00
cyril lopez	e732e44120	Redo reducer and fix PopUpForm for google provider	2018-01-25 16:28:44 +01:00
Jim LAURIE	b4aed85ad2	Merge branch 'master' into fix/overlay-blocker-stm	2018-01-25 16:16:27 +01:00
Jim LAURIE	39dacd63bf	Merge pull request #516 from strapi/fix-providers ... Fix providers	2018-01-25 16:15:21 +01:00
Jim LAURIE	319f17be4d	Merge branch 'master' into fix-providers	2018-01-25 16:01:20 +01:00
Jim LAURIE	fa2b72fd61	Merge pull request #507 from strapi/update-roles-models ... Update roles models	2018-01-25 16:00:52 +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
Jim LAURIE	27e448d54c	Merge pull request #501 from strapi/auth-provider/configs-front ... Auth provider/configs front	2018-01-25 14:30:58 +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
Aurélien GEORGET	2cbc39d8e8	Update fr.json	2018-01-25 13:37:13 +01:00
Aurélien GEORGET	449279cd07	Update en.json	2018-01-25 13:36:53 +01:00
Aurelsicoko	fc21d5f30a	Resolve conflicts	2018-01-25 13:25:09 +01:00
cyril lopez	302ab06b1d	Merge branch 'master' into fix/overlay-blocker-stm	2018-01-25 13:13:06 +01:00
Jim LAURIE	a7c9d2bbbc	Merge pull request #499 from strapi/auth-provider/configs ... Auth provider/configs	2018-01-25 13:04:49 +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
cyril lopez	1e81d96e91	Update branch ... Merge branch 'fix/overlay-blocker-stm' of github.com:strapi/strapi into fix/overlay-blocker-stm	2018-01-25 11:00:29 +01:00
cyril lopez	68cdf67d31	Remove custom OverlayBlocker in stm ... As discussed with @Aurelsicoko this feature is not needed when adding or editing a connection	2018-01-25 10:59:33 +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	d3efb41e10	Merge pull request #512 from strapi/improve-issue-template ... Improve template issue github	2018-01-25 09:46:54 +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	11d325389c	Improve template issue github	2018-01-24 22:56:38 +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
Amit Yadav	1edb583176	Merge branch 'master' into hot_fix_-467	2018-01-24 20:16:41 +05:30
Amit Yadav	bae0159208	Fixes strapi#467	2018-01-24 20:15:11 +05:30
Aurelsicoko	ed696f70a0	Refetch roles after delete	2018-01-24 13:51:22 +01:00
cyril lopez	578d2e2916	Fix css backheader and logout	2018-01-24 13:06:20 +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