232 Commits

Author	SHA1	Message	Date
Jim LAURIE	134e89aa8e	Merge branch 'master' into fix/2282	2018-12-09 11:49:21 +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	0916c4e018	Fix conflicts	2018-12-06 16:39:20 +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
Jim LAURIE	85b6dcb0e2	Merge branch 'master' into master	2018-11-29 12:11:19 +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
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
Sajjad Shirazy	43adc24f3d	Fixed #2251	2018-11-21 14:45:32 +03:30
Kamal Bennani Bouchiba	6482a6ec84	Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute	2018-11-20 19:34:46 +01:00
Aurelsicoko	4320614721	Merge branch 'master' of github.com:strapi/strapi into issue/2228	2018-11-20 16:31:26 +01:00
Kamal Bennani	4a7cae4ac0	Stringify ObjectID	2018-11-19 21:47:48 +01:00
Kamal Bennani	8500403297	Add missing this*	2018-11-19 15:42:00 +01:00
Kamal Bennani	511ca55461	fix 1st level deep filter	2018-11-19 00:10:48 +01:00
Kamal Bennani	85eeb4aef2	Fix wrong rebase	2018-11-18 23:57:03 +01:00
Leo	9a5547d4c7	Fix mongoose float and decimal problems	2018-11-18 16:25:28 +08:00
Jim LAURIE	19ec6242f9	Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute	2018-11-16 17:38:27 +01:00
Aurelsicoko	3d7dacef70	Apply options on Mongoose instance	2018-11-16 15:53:00 +01:00
Aurelsicoko	0eeb20e313	Merge branch 'master' of github.com:strapi/strapi into fix/manyToMany	2018-11-15 16:25:55 +01:00
Aurelsicoko	8fc9d01b46	Fix manyToMany relation when only sending ids	2018-11-15 16:22:13 +01:00
Jim LAURIE	8fcf2ed8ae	3.0.0-alpha.14.5	2018-11-13 14:50:07 +01:00
g-div	cca35fe9ac	fix(relations): avoid duplicate entries in manyToMany relations	2018-10-29 09:41:23 +01:00
Kamal Bennani	7801aac50f	Turn arrow functions to object functions to get to 'this'	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	4d3d4c8d55	move utility functions to their own file	2018-10-28 23:42:21 +01:00
Kamal Bennani	2d1cf3591e	Split convertParams to multiple stage steps	2018-10-28 23:42:20 +01:00
Kamal Bennani	4c3d5da8ee	Cast candidate ObjectID to Mongoose ObjectID	2018-10-28 23:42:19 +01:00
Javier Castro	ed924b057a	Fix #2211: Content-Manager: save not handling beforeSave hook throw error	2018-10-26 13:49:14 -03: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
Jim LAURIE	3d149ffc68	Merge branch 'master' into clean-dependencies	2018-10-17 16:14:26 +02:00
Jim LAURIE	40a3c0418d	Merge branch 'master' into improve-ctm/delete-edit-view	2018-10-08 20:07:22 +02:00
Jim LAURIE	87c3af3d1e	3.0.0-alpha.14.3	2018-10-08 17:14:19 +02:00
Aurelsicoko	72e47dde75	Update delete button style	2018-10-08 16:45:24 +02:00
cyril lopez	199139ada2	Update mongoose	2018-09-27 14:40:24 +02:00
Jim LAURIE	46c9b0f966	3.0.0-alpha.14.2	2018-09-26 11:08:10 +02:00
Jim LAURIE	e45b823385	Merge branch 'master' into polish-strapi-hook-mongoose	2018-09-25 10:46:17 +02:00
Jim LAURIE	86dea3279f	Merge branch 'master' into fixFilePermissions	2018-09-24 20:13:31 +02:00
Jim LAURIE	a09e88f567	Merge branch 'master' into graphql/mutations-aggregations-decimals	2018-09-24 19:42:57 +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
cyril lopez	27e0183228	Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes	2018-09-21 16:17:15 +02:00
Jason Lei	a3bdd9b3fb	Merge branch 'master' into graphql/mutations-aggregations-decimals	2018-09-15 19:53:48 +08:00
Jim LAURIE	54cf16b5f1	Merge branch 'master' into njb/fix-strapi-new	2018-09-14 15:21:18 +02:00
soupette	7906e43129	Fix conflicts	2018-09-14 13:48:43 +02:00