329 Commits

Author	SHA1	Message	Date
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
Jim LAURIE	87c3af3d1e	3.0.0-alpha.14.3	2018-10-08 17:14:19 +02:00
Jim LAURIE	d586442fbd	Fix deep delete relation for oneWay and when there is no relations	2018-10-08 12:25:44 +02:00
Jim LAURIE	870b31ce5c	Fix typo update bookshelf service	2018-10-04 17:17:25 +02:00
Jim LAURIE	46c9b0f966	3.0.0-alpha.14.2	2018-09-26 11:08:10 +02:00
Alberto Maturano	154fc28a57	Normalize to standar file permissions ... As a result of taking a look on PR #1967 I realized there is 819 executable files in this repository. It is obvious this is an error.	2018-09-24 12:33:09 -05:00
Jim LAURIE	6c897555a0	Merge branch 'master' into improvement/pluralize-routes	2018-09-18 13:47:13 +02:00
Jim LAURIE	4d8ace2db7	3.0.0-alpha.14.1.1	2018-09-13 18:39:37 +02:00
Jim LAURIE	f10335d717	3.0.0-alpha.14.1	2018-09-12 12:41:11 +02:00
soupette	b2d55b13a3	Fix pinput file	2018-09-07 12:47:45 +02:00
Jim LAURIE	cecef7385f	3.0.0-alpha.14	2018-08-27 16:30:16 +02:00
soupette	8003982b08	Fix conflicts	2018-08-22 14:17:09 +02:00
Luca	784e330b23	Merge branch 'master' into fix/NODE_ENV	2018-08-10 13:29:04 +02:00
soupette	688defca70	Fix conflict	2018-08-10 12:52:11 +02:00
Jim LAURIE	b4d97fb9db	3.0.0-alpha.13.1	2018-08-09 13:39:34 +02:00
Pierre Burgy	6a7ff7ff6d	Pluralize routes	2018-08-08 14:59:10 +02:00
Luca	732fdcd732	fix(generate-api): update before.js env	2018-08-07 22:46:10 +02:00
Jim LAURIE	1fc9513d80	Change lodash version	2018-08-06 16:03:09 +02:00
Jim LAURIE	ba99e0f24d	Merge branch 'master' into feature/spanishTranslation	2018-07-31 13:38:18 +02:00
soupette	be73140600	Use toggle and fix editPage render loop	2018-07-27 16:15:26 +02:00