73 Commits

Author	SHA1	Message	Date
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
Jim LAURIE	d116fabd16	Merge branch 'master' into patch-1	2018-07-23 12:26:56 +02: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
Johann Pinson	ffaa3fb92a	fix(graphql): add time attribute type to DateTime scalar	2018-07-03 16:31:25 +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
Jim LAURIE	684a90ca56	Merge branch 'master' into bug/graphql-do-not-formatted-values-of-type-object	2018-06-19 16:28:56 +02:00
Johann Pinson	1d4a193f7e	feat(graphql): add DateTime support instead of String	2018-06-19 11:13:32 +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
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
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
Kamal Bennani	ee89659347	fix lint	2018-05-26 18:46:56 +02:00
Kamal Bennani	67f74a8473	Fall through when the current model doesn't host the entities (not populated by default)	2018-05-26 18:46:26 +02:00
Jim LAURIE	e68bfba121	Merge branch 'master' into patch-graphql-timestamp	2018-05-25 16:24:22 +02:00
Aurelsicoko	217aae2d1b	Fixes #1058 - Amount limiting and depth limiting	2018-05-25 16:08:51 +02:00
Aurelsicoko	3805f3bc95	Fixes #1164	2018-05-25 15:31:30 +02:00
Aurelsicoko	1f2a0e5b8b	Fixes #1174	2018-05-25 15:23:13 +02:00
Jim LAURIE	93eb13e7dd	Merge branch 'master' into patch-3	2018-05-24 18:58:26 +02:00
Aurelsicoko	71ade27999	Fixes #1232	2018-05-24 18:41:36 +02:00
Aurelsicoko	c111aaba13	Fixes #1247	2018-05-24 17:20:32 +02:00
Johann Pinson	534fa00c0b	fix(graphql): change timestamp format snake_case to camelCase	2018-05-24 17:13:14 +02:00
Johann Pinson	e71063920f	Fix generate GraphQL schema if ShadowCRUD is false	2018-05-23 14:27:23 +02:00
Johann Pinson	330aac40ef	fix(graphql): update Union type creation rules	2018-05-21 15:39:45 +02:00
Johann Pinson	09cff64c5d	fix(graphql): update Union type creation rules ... My PR is a: 🐛 Bug fix Main update on the: Plugin Fix error type `Union type Morph can only include Object types, it cannot include [Enum name]`	2018-05-21 15:25:26 +02:00
Jim Laurie	4fe7b6176e	Fix conflicts & lint	2018-05-16 12:07:02 +02:00
Kamal Bennani	ba809f6149	correctly access the ref of the given model as param	2018-05-14 20:55:26 +02:00
soupette	613940c1d9	Add eslint to email and graphql backend	2018-05-02 12:28:27 +02:00
Aurelsicoko	243e5cf74d	Snakecase attribute in GraphQL when there is a dash	2018-04-20 16:30:28 +02:00
Aurelsicoko	f01b7befd1	Display createdAt and updatedAt date with GraphQL	2018-04-17 18:16:31 +02:00
Aurelsicoko	96934a23da	Improve retrieving of relationships with GraphQL	2018-04-17 17:29:24 +02:00
Aurelsicoko	aaac5ba391	Clean code	2018-04-13 14:27:50 +02:00
Aurelsicoko	17c46b331d	Make GraphQL polymorphic relationships working with Bookshelf	2018-04-11 12:53:07 +02:00