148 Commits

Author	SHA1	Message	Date
Aurelsicoko	5b93cc5242	3.0.0-alpha.8.3	2018-01-19 16:49:57 +01:00
Jim Laurie	7b0a106cb2	3.0.0-alpha.8.2	2018-01-19 08:52:34 +01:00
Jim Laurie	03643bfb13	3.0.0-alpha.8	2018-01-17 16:59:28 +01:00
Jim Laurie	7a4cb0e507	Fix data path in connectivity functions	2018-01-17 09:14:34 +01:00
FixError	c5bb2da0a4	fix bug ... (const variable is assigned it cannot be assigned again and an attempt to do so will throw an error)	2018-01-12 00:58:34 +02:00
Jim Laurie	99346d41fc	Use Path resolver for connectivity script	2018-01-11 13:22:49 +01:00
Jim Laurie	df5b9f3dab	Change wording	2018-01-10 18:08:43 +01:00
Jim Laurie	e1fb02ab53	Test connection in connector node module	2018-01-10 15:31:54 +01:00
Jim Laurie	cc4973b65b	3.0.0-alpha.7.3	2018-01-05 12:10:41 +01:00
Aurelsicoko	dafec67234	Merge branch 'master' of github.com:strapi/strapi into relation/users	2018-01-04 11:25:27 +01:00
Aurelsicoko	ca7f12e985	Improve documentation for sorting filters	2017-12-20 16:06:02 +01:00
cyril lopez	bc25ca3870	Fix typo	2017-12-18 15:18:03 +01:00
Aurelsicoko	b208b0aa92	Change table naming for plugins	2017-12-18 14:07:35 +01:00
Aurelsicoko	92c891e341	Improve error when association fail and handle configurable key in models	2017-12-16 18:26:04 +01:00
Aurelsicoko	6d8b81ecbd	Resolve conflicts	2017-12-16 17:08:58 +01:00
Aurelsicoko	0230184619	Apply same algorithm to clearRelation method	2017-12-15 18:04:56 +01:00
Aurelsicoko	492c688344	Remove unnecessary directory read when building relations	2017-12-15 16:36:21 +01:00
Jim Laurie	5b6127876d	3.0.0-alpha.7.2	2017-12-15 15:04:31 +01:00
Jim Laurie	c7ef225238	Replace id to _id for fetch user mongoose	2017-12-14 15:14:53 +01:00
Jim Laurie	1ab6ae71d8	3.0.0-alpha.7.1	2017-12-14 10:27:08 +01:00
Aurelsicoko	859e2985c8	Fix many-to-many association with Bookshelf	2017-12-13 16:28:50 +01:00
Aurelsicoko	cbd1da155b	Fix many-to-one association with Bookshelf	2017-12-13 15:30:03 +01:00
Aurelsicoko	74e1f0529d	Fix specific case in one-to-one relation	2017-12-13 14:36:07 +01:00
Aurelsicoko	b08a4d811c	Use local global to expose model for Bookshelf & move globalId definition in the core	2017-12-13 11:38:38 +01:00
Aurelsicoko	61d75648b0	Fix content-manager offset for SQL databases	2017-12-12 16:24:19 +01:00
Aurelsicoko	628ad4add4	Fix strapi-bookshelf to work w/ associations w/ plugins & JWT condition	2017-12-12 16:14:38 +01:00
Jim Laurie	6d39c26568	3.0.0-alpha.7	2017-12-11 15:11:29 +01:00
Jim Laurie	95607dc7ed	Load bookshelf plugin model if not apis	2017-11-30 13:57:47 +01:00
cyril lopez	b4a6336f14	Fix typo in request helper	2017-11-29 15:55:32 +01:00
cyril lopez	7afb425688	Fix query bookshelf and modify init role file	2017-11-29 15:42:11 +01:00
Jim Laurie	baa2f92040	Mount plugin models for bookshelf	2017-11-28 15:00:49 +01:00
Jim Laurie	aecbbcf3ba	Handle default connection for mongoose	2017-11-28 14:28:30 +01:00
cyril lopez	51194f28b5	Fix conflict	2017-11-17 17:22:41 +01:00
Jim Laurie	8cf8c24ee7	Load bookshelf plugins models	2017-11-15 17:27:07 +01:00
Jim Laurie	4bd0427ba6	Fix mongoose collection prefix plugin	2017-11-15 16:59:12 +01:00
Aurelsicoko	6f4086be2e	Merge from master	2017-11-14 11:53:51 +01:00
Aurelsicoko	2ceed9b1cf	Add rimraf as dependency	2017-11-14 11:44:38 +01:00
Aurelsicoko	98cbcd6940	Don't execute npm prune on every npm install	2017-11-13 19:38:16 +01:00
Aurelsicoko	f80b54f1e0	Avoid to rebuild admin during installation and remove useless dependencies	2017-11-13 19:24:29 +01:00
Jim Laurie	790cee753e	3.0.0-alpha.6.7	2017-11-08 15:46:28 +01:00
Jim Laurie	ef601d6e9a	3.0.0-alpha.6.6	2017-11-07 17:20:06 +01:00
Jim Laurie	30e39254a6	Change strapi version to alpha.6.5	2017-11-06 15:52:36 +01:00
Jim Laurie	8b8115bac1	Merge branch 'alpha.7' of https://github.com/strapi/strapi into alpha.7	2017-11-03 12:13:20 +01:00
Jim Laurie	77013bc4b2	Fix conflicts	2017-11-03 12:00:08 +01:00
Jim Laurie	6c376456fb	Fix conflicts	2017-11-03 11:51:55 +01:00
Jim Laurie	49901024cd	Delete useless variable	2017-11-02 13:57:52 +01:00
Jim Laurie	084cb3c49e	Fix PR feedback	2017-11-01 15:16:28 +01:00
Jim Laurie	14b2676524	Fix relation create one to one object	2017-10-31 14:44:34 +01:00
Jim Laurie	c479480d34	Fix relation create one to one	2017-10-31 13:43:48 +01:00
Jim Laurie	e038a238e7	Handle template on create API content type builder	2017-10-30 14:40:46 +01:00