620 Commits

Author	SHA1	Message	Date
Aurelsicoko	c111aaba13	Fixes #1247	2018-05-24 17:20:32 +02:00
Jim LAURIE	74d3987a11	Merge branch 'master' into add-styled-component	2018-05-18 11:07:32 +02:00
Jim Laurie	31c0d7457a	3.0.0-alpha.12.2	2018-05-17 16:54:27 +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	4069a3bdaf	Fix fail build on publish npm release	2018-05-16 15:22:20 +02:00
Jim Laurie	4fe7b6176e	Fix conflicts & lint	2018-05-16 12:07:02 +02:00
soupette	51f5adc56a	Add styled-components	2018-05-15 14:07:18 +02:00
Jim LAURIE	f4905a9b2e	Merge branch 'master' into enhance/relations	2018-05-14 17:33:37 +02:00
Jim LAURIE	0c6f86ce3e	Merge branch 'master' into eslint	2018-05-14 16:13:47 +02:00
Jim LAURIE	371d2fbebb	Merge branch 'master' into fix-870	2018-05-14 15:06:42 +02:00
soupette	de22d0e130	Remove createdAt fields as well	2018-05-14 15:02:30 +02:00
soupette	17e9340276	Fixes #870	2018-05-14 14:17:51 +02:00
Jim Laurie	79881f3707	Remove componentDidCatch from Edit page content manager	2018-05-14 13:35:15 +02:00
cyril lopez	1f019c60c3	Merge branch 'master' into eslint	2018-05-14 11:50:32 +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	0bb4f9cfae	Merge branch 'master' into npmignore	2018-05-08 11:36:35 +02:00
Jim LAURIE	c09f5138a2	Merge branch 'master' into eslint	2018-05-07 16:03:35 +02:00
Jim Laurie	8f5443db17	3.0.0-alpha.12.1.3	2018-05-07 10:46:43 +02:00
soupette	2df4cb3311	Remove npm run lint test in all packages	2018-05-07 09:29:35 +02:00
Jim Laurie	38fc1aade7	Fix input relation	2018-05-06 20:34:33 +02:00
Abdón Rodríguez Davila	0fbf3cae79	Ignore .editorconfig & .gitattributes in npm plugins & admin	2018-05-04 16:47:07 +02:00
soupette	74de4da177	Change test	2018-05-04 11:55:34 +02:00
soupette	601143b4d5	Remove eslint dependencie in all packages	2018-05-04 11:08:41 +02:00
Jim Laurie	c491c61a97	3.0.0-alpha.12.2	2018-05-03 14:15:21 +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
Jim LAURIE	a3d9454ee0	Merge branch 'master' into fix-ctb	2018-05-01 11:29:31 +02:00
soupette	4f498cea06	Add eslint to ctb backend	2018-04-30 17:27:46 +02:00
soupette	85cf6dfb91	Rename eslint folder	2018-04-30 16:56:45 +02:00
soupette	8a4412d6d6	Add eslint to ctm backend folders	2018-04-30 16:32:48 +02:00
Zhuang	7634ff5602	add simplify chineses translation for plugins	2018-04-30 22:09:53 +08: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
Jim LAURIE	9cc62373f0	Merge branch 'master' into sql-xp	2018-04-27 16:29:49 +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	1850d5539b	Merge branch 'master' into improve-webpack-config	2018-04-26 14:20:10 +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
soupette	b7fffb0ce7	Fixes #958	2018-04-25 16:34:20 +02:00
Jim Laurie	dcf020662c	Fix manyToMany content manager	2018-04-25 15:40:49 +02:00