248 Commits

Author	SHA1	Message	Date
Jim LAURIE	f90255bb75	Merge branch 'master' into issue/2327	2019-01-22 13:52:13 +01:00
Paolo Ragone	d39031605c	Merge branch 'master' into lint_improvement	2019-01-17 22:18:33 +13:00
Jim LAURIE	c3c24ca7ad	3.0.0-alpha.19	2019-01-16 11:49:16 +01:00
Paolo Ragone	803ce0bea0	Merge branch 'master' into lint_improvement	2019-01-09 21:25:44 +13:00
Jim LAURIE	a23fe2c307	Remove relations route from bookshelf template	2019-01-06 15:17:59 +01:00
Aurélien Georget	b501e8bb1b	Resolve conflicts	2019-01-05 20:33:47 +01:00
Paolo Ragone	e1079ce362	Added comment so linting doesn't go crazy on generated service files	2019-01-05 09:51:06 +13:00
Jim LAURIE	09530e9cd9	3.0.0-alpha.18	2019-01-04 11:23:15 +01:00
Jim LAURIE	45bcaf770b	Update to 2019	2019-01-02 09:41:53 +01:00
Jim LAURIE	fd3ae96498	3.0.0-alpha.17	2018-12-18 14:37:15 +01:00
Jim LAURIE	596d4dd791	Merge branch 'master' into add-cypress	2018-12-12 20:18:57 +01:00
soupette	27df580edb	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-12-11 12:12:53 +01:00
Aurélien Georget	53b195c917	Avoid useless population	2018-12-06 19:12:31 +01:00
Aurélien Georget	e1ce257d2f	Revert codebase and apply limit, skip, start and sort parameters	2018-12-06 18:11:53 +01:00
soupette	636cb54c29	Add snyk	2018-12-05 15:42:58 +01:00
Jim LAURIE	a75e0c5485	3.0.0-alpha.16	2018-12-04 18:31:19 +01:00
Jim LAURIE	03c1e04d87	Revert filter PR	2018-12-04 17:05:03 +01:00
soupette	66e45eb896	Change cypress test folder name	2018-12-03 12:06:09 +01:00
soupette	43e02ffb3d	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-12-03 11:24:03 +01:00
Jim LAURIE	c126b94325	Merge branch 'master' into fixNodeVersions	2018-11-29 11:21:55 +01:00
Jim LAURIE	fb03d4f18c	3.0.0-alpha.15	2018-11-28 14:55:41 +01:00
DMehaffy	ecb6baaea5	Update all the packages and generated json	2018-11-28 00:14:12 -07:00
Aurélien Georget	b0aaae9f12	Resolve conflicts	2018-11-27 18:48:37 +01:00
Aurélien Georget	143f92a338	Follow generated GraphQL input to return data	2018-11-26 18:32:35 +01:00
soupette	80adfdfde8	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-22 19:45:31 +01:00
Aurelsicoko	21d21dfc8f	Handle single fetch & allow override of default auto-population	2018-11-22 18:32:33 +01:00
Aurelsicoko	402d1fb4b6	Map result to retrieve data from loaders	2018-11-21 19:37:19 +01:00
Jim LAURIE	afbdc9b2bb	Fix indent	2018-11-21 16:48:23 +01:00
Jim LAURIE	412efec32a	Fix space	2018-11-21 16:47:28 +01:00
Jim LAURIE	954a6d321a	Fix indent	2018-11-21 16:47:01 +01:00
Kamal Bennani	886e39d196	I'm a newby	2018-11-19 21:48:54 +01:00
Kamal Bennani	53849ff12c	Fix sort	2018-11-19 00:12:09 +01:00
Jim LAURIE	19ec6242f9	Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute	2018-11-16 17:38:27 +01:00
soupette	d9ee893c8f	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-14 18:20:40 +01:00
Jim LAURIE	8fcf2ed8ae	3.0.0-alpha.14.5	2018-11-13 14:50:07 +01:00
soupette	2a5f0c95d2	Fix conflict	2018-11-08 17:54:45 +01:00
Jim LAURIE	02d935188d	Fix test launch	2018-10-31 17:20:09 +01:00
Kamal Bennani	957368b8b2	Add a support of deep filter in bookshelf	2018-10-28 23:44:38 +01:00
Kamal Bennani	0ed9b7643a	Merge where and relation payload	2018-10-28 23:42:22 +01:00
Kamal Bennani	5bdb5c25e0	use stage functions from the relation file	2018-10-28 23:42:22 +01:00
Kamal Bennani	15a41614fa	Don't populate relations in Graphql context	2018-10-28 23:42:22 +01:00
Kamal Bennani	bbfb2418a5	Move functions that deals with stages to the mongoose relation file	2018-10-28 23:42:21 +01:00
Kamal Bennani	3c37c33d58	Rewrite the logic of deep population & matching	2018-10-28 23:42:20 +01:00
Kamal Bennani	83da9fa38a	[Bugfix] take the correct localField when having a manyToOne RS	2018-10-28 23:42:19 +01:00
Kamal Bennani	ff0a87df7a	Update Bookshelf/Mongoose service template to support relation attribute filtering	2018-10-28 23:42:18 +01:00
Jim LAURIE	01a2442e7d	3.0.0-alpha.14.4.0	2018-10-25 17:18:26 +02:00
Jim LAURIE	379331f822	3.0.0-alpha.14.4	2018-10-25 16:41:07 +02:00
cyril lopez	3e67bd6e08	Remove fs extra and use shelljs in tests	2018-10-19 18:58:11 +02:00
Nick Verwymeren	d123b14ae5	Fixes issues when doing an 'IN' query ... When doing an 'IN' query it looks like this will incorrectly loop over the values and put them into multiple where clauses. This additional check on the symbol should leave the array untouched and pass it on into the orm for processing.	2018-10-17 11:50:43 -05:00
Jim LAURIE	3f15b07aa0	Merge branch 'master' into fix/1483	2018-10-09 12:25:07 +02:00