149 Commits

Author	SHA1	Message	Date
Aurelsicoko	18d3b9cf1e	Resolve merge	2018-06-13 17:56:41 +02:00
Aurelsicoko	208319b8a2	Update request helper	2018-06-13 16:16:46 +02:00
soupette	c8492a6b11	Clean code	2018-06-06 16:49:25 +02:00
soupette	127179cd76	Fix conflicts	2018-06-06 16:24:11 +02:00
soupette	92600ab7b0	Handle bulk action for bookshelf	2018-06-06 12:47:29 +02:00
soupette	8832a5baab	Delete many and update relations ... Co-authored-by aurelsicoko@gmail.com	2018-06-05 18:35:19 +02:00
soupette	e145c82b7a	Front	2018-06-05 17:56:53 +02:00
soupette	4e2b7218f6	Bulk actions front-end done	2018-06-05 14:20:13 +02:00
soupette	44cff94989	Fix conflicts	2018-05-31 15:31:46 +02:00
soupette	b8f0b327b7	Empty layout	2018-05-31 14:14:01 +02:00
soupette	2c262f7d19	Fix build css	2018-05-31 13:57:08 +02:00
soupette	6a720481b6	Fix anim	2018-05-30 13:59:49 +02:00
Johann Pinson	de691ca47f	Fix toJSON verification	2018-05-29 15:08:43 +02:00
soupette	3847fd8c67	Fix filter for decimal	2018-05-25 13:21:57 +02:00
soupette	eecccbcbd8	Remove Json from available filters	2018-05-24 18:15:35 +02:00
soupette	6068ed3f00	Fix date filter	2018-05-23 14:35:22 +02:00
soupette	87d70a8d34	Fix count query bookshelf in ctm & users-permissions	2018-05-23 10:29:04 +02:00
soupette	1fae3e9852	Fix ctm bookshelf find query with sort	2018-05-22 18:23:03 +02:00
soupette	185350f07c	Fix count routes for mongoose	2018-05-22 17:11:35 +02:00
soupette	7260bbe309	Add actions to filterpicker	2018-05-21 17:16:04 +02:00
soupette	e9ce813474	Handle change input filters	2018-05-18 17:54:38 +02:00
Aurelsicoko	bcb81a928e	Remove layout.json & add it in .gitignore	2018-05-17 15:12:00 +02:00
Aurelsicoko	9c8d87a8fd	Remove log	2018-05-17 13:52:09 +02:00
Jim Laurie	4fe7b6176e	Fix conflicts & lint	2018-05-16 12:07:02 +02:00
Aurelsicoko	c7f871745a	Fix findOne user, many-to-many relationship loss and remove relation business logic from CM	2018-05-09 16:57:16 +02:00
Aurelsicoko	fc44709069	Move relational management into a separate file	2018-05-08 18:44:47 +02:00
Jim LAURIE	c09f5138a2	Merge branch 'master' into eslint	2018-05-07 16:03:35 +02:00
Aurelsicoko	c67e2ef6d4	Avoid to loose relationship when editing from the many side	2018-05-03 12:08:35 +02:00
Aurelsicoko	e9202c7a24	Fix loosing of morph relations on update in CM with Bookshelf	2018-05-02 17:52:23 +02:00
Aurelsicoko	2fe530e334	Merge branch 'master' of github.com:strapi/strapi into upload/bookshelf	2018-05-02 17:08:07 +02:00
Aurelsicoko	e3fc6ad30b	Remove the return to avoid the loop break	2018-05-02 17:07:03 +02:00
Jim LAURIE	e6a14367f3	Merge branch 'master' into fix-cm-entry-relations	2018-05-02 17:04:41 +02:00
Aurelsicoko	ce3d52d73e	Fix single upload with Bookshelf	2018-05-02 16:15:36 +02:00
Jim Laurie	3ea2c8a775	Fix entry create relations	2018-05-02 15:39:12 +02:00
soupette	8a4412d6d6	Add eslint to ctm backend folders	2018-04-30 16:32:48 +02:00
soupette	ba6011beda	Fix popuprelation bug	2018-04-30 15:30:49 +02:00
soupette	62246d185f	Fix conflicts	2018-04-30 14:04:08 +02:00
soupette	0ca85934ac	Add strapi-lint to ctm plugin and modify monorepo setups script to install it. ... Now the strapi-lint is installed in both the ctm and the helper-plugin. It will be installed in all plugins later. Important the updated eslint configuration requires to modify a lot of files....	2018-04-27 16:25:23 +02:00
Jim Laurie	d986cb4cc8	Fix relation table creation	2018-04-27 14:53:09 +02:00
Jim Laurie	a6c0616dfc	Handle update type	2018-04-27 13:47:09 +02:00
Jim Laurie	273f22c70d	Fix entry value	2018-04-26 14:10:17 +02:00
Jim Laurie	1ee8d9b30a	Fix PR feedback - handle type float	2018-04-26 13:47:40 +02:00
soupette	611dfb32eb	Merge branch 'master' of github.com:strapi/strapi into sql-xp	2018-04-26 10:26:09 +02:00
Jim Laurie	dcf020662c	Fix manyToMany content manager	2018-04-25 15:40:49 +02:00
Aurelsicoko	265fb1bdd9	Fix beforeCreate lifecycle	2018-04-25 12:23:53 +02:00
Jim Laurie	8d2a46cd0c	Fix conflict timestamp	2018-04-25 11:06:12 +02:00
Jim Laurie	ad32122a27	Create many to many table	2018-04-24 17:48:15 +02:00
Aurelsicoko	99f2b34549	Fix loose of file relation & select latest associated file	2018-04-23 12:59:53 +02:00
Aurelsicoko	87b07c8eeb	Resolve conflicts	2018-04-13 18:04:03 +02:00
soupette	795993a9b6	Empty ctm layout.json	2018-04-13 15:14:11 +02:00