122 Commits

Author	SHA1	Message	Date
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
Jim Laurie	0a7b65be04	Remove relation on delete data bookshelf	2017-10-30 14:02:54 +01:00
Jim Laurie	a2214ed0d7	Handle relation bookshelf oneToOne	2017-10-27 19:06:22 +02:00
Jim Laurie	08970eee3e	Handle manyToMany relations bookshelf by object	2017-10-27 18:22:58 +02:00
Jim Laurie	c47492ea21	Handle manyToMany relations bookshelf by id	2017-10-27 17:57:50 +02:00
Jim Laurie	35b6a50810	Handle relation oneToMany dominant bookshelf	2017-10-26 17:21:23 +02:00
Aurelsicoko	b0d2a3c838	3.0.0-alpha.6.4	2017-10-23 12:24:44 +02:00
Aurelsicoko	3bb952d58f	Update dependencies	2017-10-18 18:39:32 +02:00
Aurelsicoko	9586a8cabc	3.0.0-alpha.6.3	2017-10-16 15:13:28 +02:00
Aurelsicoko	b5955739da	3.0.0-alpha.6.2	2017-10-16 12:29:47 +02:00
Aurelsicoko	5d06875a20	3.0.0-alpha.6.1	2017-10-16 11:44:29 +02:00
Aurelsicoko	287b5e17f9	3.0.0-alpha.6	2017-10-16 11:07:41 +02:00
Jim Laurie	042e66513e	Fix require model utils	2017-09-29 14:26:28 +02:00
Jim Laurie	7bd5f1021e	Fix conflicts	2017-09-28 13:18:36 +02:00
Aurelsicoko	51d936b559	Resolve conflicts	2017-09-25 18:28:45 +02:00
Aurelsicoko	019690d6d6	Improve notification behaviour and solve issue with no relationships	2017-09-19 13:40:26 +02:00
Aurelsicoko	d8b14f6b67	Fix spread issue	2017-09-18 18:20:33 +02:00
Aurelsicoko	eef2d3d96e	Handle relationships edition for Bookshelf	2017-09-14 18:47:10 +02:00
Aurelsicoko	4e089f7909	Solve issues to be able to use bookshelf correctly	2017-09-14 16:33:56 +02:00
Jim Laurie	4a18fe6b13	Add bookshelf filters	2017-09-13 12:18:54 +02:00
Pierre Burgy	83e6a6bcc4	Merge	2017-09-08 13:46:50 +02:00
Aurelsicoko	0affa346ce	3.0.0-alpha.5.5	2017-08-25 14:52:03 +02:00
Aurelsicoko	b64015f23a	3.0.0-alpha.5.4	2017-08-25 14:00:40 +02:00
Aurelsicoko	463345998c	3.0.0-alpha.5.3	2017-08-24 18:50:09 +02:00
Aurelsicoko	fb0296c912	3.0.0-alpha.5.1	2017-08-24 16:40:15 +02:00
Aurelsicoko	3aec65e332	Update generate admin path	2017-08-24 10:21:24 +02:00
Aurelsicoko	e91a6a9012	3.0.0-alpha.5	2017-08-23 19:04:11 +02:00