118 Commits

Author	SHA1	Message	Date
Jim LAURIE	d4341797a0	Merge branch 'master' into fix-relation	2018-08-20 16:32:13 +02:00
Jim LAURIE	b4d97fb9db	3.0.0-alpha.13.1	2018-08-09 13:39:34 +02:00
Jakub Skořepa	b7edcffff8	Fix the fix ... It turns out that in some situations it actually is only the id instead of object (nested queries).	2018-08-08 00:05:33 +02:00
Jakub Skořepa	3645cc15f4	Fix one to many relation querying in the other direction	2018-08-07 14:42:33 +02:00
Aurelsicoko	120f515e5e	Better design many-to-many and add jump link	2018-07-31 16:57:16 +02:00
Jim LAURIE	a0c49e3340	Fix package conflicts	2018-07-26 16:19:28 +02:00
Jim LAURIE	09a2a4b73d	3.0.0-alpha.13.0.1	2018-07-26 16:12:17 +02:00
Jim LAURIE	927a900f5b	3.0.0-alpha.13	2018-07-25 17:31:16 +02:00
Jim LAURIE	e7a8659f44	Merge branch 'master' into gitignore	2018-07-23 16:06:22 +02:00
Jim LAURIE	d116fabd16	Merge branch 'master' into patch-1	2018-07-23 12:26:56 +02:00
Leon Kyneur	92b045f647	Include yarn.lock in packages .gitignore	2018-07-22 09:26:48 +08:00
Jim LAURIE	f8febb5b8b	Merge branch 'master' into graphql-type-datetime	2018-07-17 12:28:37 +02:00
Erin Dachtler	c0554e8571	Fix for JSON attribute types in GraphQL ... Fixes #1476	2018-07-12 12:37:19 -07:00
Jim LAURIE	fa94d12e4f	3.0.0-alpha.12.7.1	2018-07-10 18:10:42 +02:00
Jim LAURIE	a6d48caad9	3.0.0-alpha.12.7	2018-07-10 15:37:47 +02:00
Jim LAURIE	74adea6a40	Merge branch 'master' into yarn-install	2018-07-03 17:10:00 +02:00
Johann Pinson	ffaa3fb92a	fix(graphql): add time attribute type to DateTime scalar	2018-07-03 16:31:25 +02:00
Jim LAURIE	534b17f77f	3.0.0-alpha.12.6	2018-06-26 18:23:36 +02:00
cyril lopez	f056c44dd6	Fix conflicts	2018-06-22 14:17:32 +02:00
Johann Pinson	6bbc5c8993	fix(datetime): add datetime and timestamp detection	2018-06-20 19:09:37 +02:00
Johann Pinson	34aef5bbc6	fix(datetime): update npm dependencies	2018-06-20 10:09:34 +02:00
Jim LAURIE	684a90ca56	Merge branch 'master' into bug/graphql-do-not-formatted-values-of-type-object	2018-06-19 16:28:56 +02:00
Jim LAURIE	a7d8a3c566	Merge branch 'master' into patch-graphql-playground-prod	2018-06-19 16:19:00 +02:00
Johann Pinson	1d4a193f7e	feat(graphql): add DateTime support instead of String	2018-06-19 11:13:32 +02:00
Jim LAURIE	92bdb4e758	3.0.0-alpha.12.5	2018-06-18 16:49:28 +02:00
Johann Pinson	295aef53b0	feat(graphql): add option to enable playground anywhere	2018-06-18 11:22:52 +02:00
Jim LAURIE	4a2452a55b	Merge branch 'master' into master	2018-06-14 16:06:11 +02:00
Johann Pinson	bdd1dc9e0d	fix(graphql): update enumeration detection	2018-06-13 22:23:48 +02:00
Jim Laurie	69157dbba2	3.0.0-alpha.12.4	2018-06-13 17:39:37 +02:00
Jim LAURIE	30ccd14ff6	Merge branch 'master' into fix-count	2018-06-12 14:32:50 +02:00
Jim Laurie	cedfe83150	Add test count route	2018-06-12 14:28:37 +02:00
Daan De Deckere	732038593f	Use type ID for primary key instead of String. ... Fixes #1356.	2018-06-09 22:03:53 +02:00
Kamal Bennani	4920c1fa76	Set the entry type only when the value is defined	2018-06-08 20:27:45 +02:00
Johann Pinson	e215c70bbc	Merge branch 'master' into patch-graphql-enum	2018-06-08 19:43:29 +02:00
Johann Pinson	ac49805641	refactor(graphql): improve codebase array function + remove useless string template	2018-06-08 19:43:10 +02:00
Kamal Bennani	e9fc37d03a	Add comment to handle fields of type array	2018-06-08 02:39:52 +02:00
Kamal Bennani	b85baf568e	use default format for fields of type string and text	2018-06-08 02:38:32 +02:00
Kamal Bennani	a8da79c6f8	Place the break in the correct place	2018-06-08 02:37:56 +02:00
Johann Pinson	e923971805	feat(playground): upgrade the minimal version	2018-06-07 12:51:10 +02:00
Jim Laurie	2a449532ec	3.0.0-alpha.12.3	2018-06-06 17:34:07 +02:00
soupette	5698969770	Fix build	2018-06-05 19:03:59 +02:00
soupette	8302d32d71	Merge branch 'master' of github.com:strapi/strapi into content-manager-filters	2018-06-05 12:06:17 +02:00
Cyril lopez	cb895ab586	Fix PR feedback	2018-06-04 17:46:08 +02:00
Jim Laurie	78e064e72c	Fix missing file	2018-06-04 14:49:21 +02:00
Johann Pinson	eda412785f	feat(graphql): generate default name for Enum if not specified	2018-06-01 15:28:18 +02:00
Kamal Bennani Bouchiba	ff2543652f	Merge branch 'master' into bugfix/graphql-returns-empty-array-when-entities-are-not-hosted-by-the-model	2018-05-31 17:06:45 +02:00
Jim LAURIE	aeff4d663c	Merge branch 'master' into patch-graphql-required	2018-05-31 12:22:18 +02:00
Jim LAURIE	aee7157d5a	Merge branch 'master' into fix/graphql	2018-05-29 21:09:57 +02:00
Johann Pinson	ce2f41a5be	feat(graphql): enable enum creation into schema from model	2018-05-28 17:45:26 +02:00
Johann Pinson	be4a45b5dd	feat(graphql): add required flag	2018-05-28 17:31:42 +02:00