6761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Johann Pinson	bdd1dc9e0d	fix(graphql): update enumeration detection	2018-06-13 22:23:48 +02:00
soupette	f52880e810	Init loader plugin users	2018-06-13 22:12:11 +02:00
Jim Laurie	9339b0cb8e	Update email provider versions	2018-06-13 21:41:36 +02:00
Jim LAURIE	e0537e1eb6	Merge branch 'master' into master	2018-06-13 21:36:54 +02:00
Jim Laurie	e7588e4d1a	Fix PR feedback	2018-06-13 21:32:40 +02:00
Jim LAURIE	30d5ea4777	Merge pull request #1380 from strapi/3.0.0-alpha.12.4 ... 3.0.0-alpha.12.4	2018-06-13 20:55:46 +02:00
soupette	d9be6cb831	Add loaders to SocialLink HP	2018-06-13 18:38:45 +02:00
soupette	f47aed1d3e	Add loaders to hp	2018-06-13 18:27:03 +02:00
Aurelsicoko	18d3b9cf1e	Resolve merge	2018-06-13 17:56:41 +02:00
soupette	b76574714c	Create specific loader for the WYSIWYG	2018-06-13 17:48:37 +02:00
Aurelsicoko	a850410009	Change test side on manyToMany delete all	2018-06-13 17:45:39 +02:00
Jim Laurie	69157dbba2	3.0.0-alpha.12.4 v3.0.0-alpha.12.4	2018-06-13 17:39:37 +02:00
soupette	4268f788c9	Add loading view to editpage	2018-06-13 17:36:02 +02:00
Jim LAURIE	cfcf150f27	Merge pull request #1376 from derrickmehaffy/fix1373 ... Add oneWay relation type to Bookshelf	2018-06-13 17:07:04 +02:00
Jim LAURIE	96445f5c16	Merge branch 'master' into fix1373	2018-06-13 17:05:53 +02:00
soupette	915d419a59	Fix conflicts	2018-06-13 16:34:28 +02:00
soupette	5cae072b19	Add loaders to ctm listpage	2018-06-13 16:17:19 +02:00
Aurelsicoko	208319b8a2	Update request helper	2018-06-13 16:16:46 +02:00
Jim Laurie	b0a2ae5989	Update contributing guide - remove analytics setup	2018-06-13 15:42:18 +02:00
Jim LAURIE	ee56c16e33	Merge pull request #1365 from strapi/enhance-ui-forgot-password ... Change design when email forgot-password has been sent	2018-06-13 15:37:39 +02:00
Aurelsicoko	7e5b859575	Split tests in packages	2018-06-13 15:31:33 +02:00
Jim LAURIE	72486df66a	Merge branch 'master' into enhance-ui-forgot-password	2018-06-13 15:25:18 +02:00
Johan Baath	5859af4027	don't update the state of the form if wysiwyg content has not changed	2018-06-13 14:57:07 +02:00
DMehaffy	22157f3b70	Add oneWay type	2018-06-13 05:15:55 -07:00
Jim LAURIE	32e362ec09	Merge pull request #1375 from strapi/fix-enum-icon ... Fix enum icon	2018-06-13 14:09:07 +02:00
Jim Laurie	25efd6bced	Fix enum icon	2018-06-13 14:02:32 +02:00
Jim LAURIE	439329dfbd	Merge pull request #1363 from strapi/ctm-search ... Add search to content manager	2018-06-13 12:41:17 +02:00
Jim LAURIE	e5048b00ed	Merge branch 'master' into ctm-search	2018-06-13 12:09:18 +02:00
Jim LAURIE	e2b687a58f	Merge pull request #1364 from strapi/improve-ctb-ux ... Improve content builder UX	2018-06-13 12:09:03 +02:00
Jim Laurie	3a8173171e	Clean some lint	2018-06-13 11:54:21 +02:00
Jim LAURIE	ddad496f87	Merge branch 'master' into improve-ctb-ux	2018-06-13 11:38:48 +02:00
Jim LAURIE	ea6036d0f7	Merge pull request #1362 from strapi/remove-analytics-plugin ... Remove plugin analytics on app creation	2018-06-13 11:38:35 +02:00
Jim LAURIE	ec70b74edb	Merge branch 'master' into remove-analytics-plugin	2018-06-13 11:21:51 +02:00
Jim LAURIE	6066409900	Merge pull request #1367 from strapi/fix-default-role ... Fix default role provider and for create user	2018-06-13 11:21:34 +02:00
Jim LAURIE	489275aa65	Merge branch 'master' into fix-default-role	2018-06-13 11:04:02 +02:00
Jim LAURIE	41b474745d	Merge pull request #1369 from strapi/fix-main-field ... Fix delete info.mainFied in content type builder	2018-06-13 11:03:34 +02:00
soupette	84871a0fd5	Add full page loader	2018-06-13 10:39:50 +02:00
Jim LAURIE	dbe235de3b	Merge branch 'master' into ctm-search	2018-06-13 10:34:12 +02:00
Jim Laurie	d240e2ac82	Fix delete info.mainFied in content type builder fix #1301	2018-06-12 22:48:31 +02:00
Jim Laurie	4d47d65c6d	Fix default role provider and create user fix #1212	2018-06-12 19:19:10 +02:00
Aurelsicoko	c2d0e81f22	Run Jest in the monorepo packages	2018-06-12 17:41:28 +02:00
soupette	1536896f62	Add loadable to plugins	2018-06-12 17:27:40 +02:00
Jim LAURIE	07f2c3aea5	Merge pull request #1334 from makzimko/master ... Enhance onboard message CLI	2018-06-12 15:41:02 +02:00
soupette	ae236ffb3e	Change design when email forgot-password has been sent	2018-06-12 15:38:04 +02:00
Jim LAURIE	bdf17927fe	Merge branch 'master' into master	2018-06-12 14:50:52 +02:00
Jim LAURIE	57de07fbb8	Merge pull request #1352 from strapi/fix-count ... Fix route count	2018-06-12 14:50:08 +02:00
Jim LAURIE	30ccd14ff6	Merge branch 'master' into fix-count	2018-06-12 14:32:50 +02:00
Jim LAURIE	b48cfda933	Merge pull request #1288 from johannpinson/patch-graphql-enum ... Add Enum into GraphQL schema	2018-06-12 14:32:34 +02:00
Jim Laurie	cedfe83150	Add test count route	2018-06-12 14:28:37 +02:00
soupette	8e1b3cb3c1	Add redirection to choose attributes modal	2018-06-12 14:15:04 +02:00