1670 Commits

Author	SHA1	Message	Date
Alexandre Bodin	a1d3c3abb5	Merge branch 'develop' into features/dynamic-zones	2019-11-13 19:25:16 +01:00
Alexandre Bodin	f2e380782a	Fix lint rule	2019-11-13 18:54:22 +01:00
Alexandre Bodin	6478e53ab8	Support dynamic zone upload file	2019-11-13 18:49:08 +01:00
Alexandre Bodin	56bdd3d806	Fix tests	2019-11-13 18:49:07 +01:00
Alexandre Bodin	d405285fae	Handle component update and delete with categories	2019-11-13 18:49:06 +01:00
Alexandre Bodin	2ee39bc9d8	Add components and nested components directly with the content types and compos schemas	2019-11-13 18:49:04 +01:00
Alexandre Bodin	79d1207c0c	Create dynamiczone in queries	2019-11-13 18:49:02 +01:00
Alexandre Bodin	b9122edf0d	Rename groups to components	2019-11-13 18:49:02 +01:00
Alexandre Bodin	4ee0160e6c	Remove general settings	2019-11-13 18:49:01 +01:00
Alexandre Bodin	b2e0ec5d1f	v3.0.0-beta.17.5	2019-11-04 17:52:02 +01:00
Josh Rose	70a5203e83	fix: Ensure state is updated before updating select	2019-10-29 15:31:33 +01:00
Nguyen Tung	cd218a8f49	fix: multiple media in repeatable groups not working #4205	2019-10-26 12:01:03 +07:00
Alexandre Bodin	7a61db7285	v3.0.0-beta.17.4	2019-10-23 15:11:30 +02:00
Alexandre Bodin	9280cf9cd7	Merge branch 'master' into develop	2019-10-22 11:15:09 +02:00
Alexandre Bodin	3ddd383c30	v3.0.0-beta.17.3	2019-10-22 11:05:52 +02:00
soupette	6a852ad6cb	Fix conflicts	2019-10-18 15:51:44 +02:00
Virginie Ky	4d22b721ae	review done	2019-10-18 15:25:08 +02:00
Alexandre Bodin	b6feabf689	v3.0.0-beta.17.2	2019-10-18 13:42:22 +02:00
Virginie Ky	c4886d7936	review ip	2019-10-17 13:46:39 +02:00
Alexandre Bodin	f0ad2ab52c	Merge branch 'master' into develop	2019-10-16 14:16:52 +02:00
Jelmer Visser	4babfb359f	Merge branch 'master' into fix/#3101	2019-10-16 13:13:19 +02:00
Alexandre Bodin	9f0713649b	v3.0.0-beta.17.1	2019-10-16 11:42:54 +02:00
Alexandre Bodin	7c8eda443e	v3.0.0-beta.17	2019-10-16 10:40:18 +02:00
Jelmer Visser	f91f3e4184	Fixes #3101	2019-10-15 20:37:15 +02:00
Virginie Ky	c53f3672b1	merge	2019-10-11 15:16:51 +02:00
Virginie Ky	5b32e32758	Some UI fixes	2019-10-11 14:59:41 +02:00
Virginie Ky	8040e89d7f	clean css and buttons ui	2019-10-10 16:21:32 +02:00
soupette	a27c8b2887	Merge branch 'develop' of github.com:strapi/strapi into front/remove-sass	2019-10-10 06:34:54 +02:00
soupette	beef6e5510	Fix conflicts	2019-10-10 06:34:31 +02:00
soupette	e84beef88f	fix tests	2019-10-09 18:12:42 +02:00
soupette	7e56dbb9c0	Remove scss in ctm	2019-10-09 10:55:48 +02:00
cyril lopez	b6a4b3019e	Merge branch 'develop' into front/remove-sass-admin	2019-10-08 15:12:03 +02:00
soupette	a288198306	Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb	2019-10-08 12:34:48 +02:00
Virginie Ky	edc61d3522	Fix conflicts	2019-10-08 12:27:04 +02:00
Virginie Ky	0c23fe8bae	Content manager UI	2019-10-08 11:51:10 +02:00
Virginie Ky	82e45e382e	Content manager Filters UI	2019-10-08 11:33:52 +02:00
soupette	b214765287	Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb	2019-10-08 09:39:10 +02:00
soupette	75abb17f0f	Fix conflicts	2019-10-08 09:17:47 +02:00
Virginie Ky	42257b3af4	Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb	2019-10-07 13:54:31 +02:00
Virginie Ky	cde0369024	content manager displayed fields dropdown ui	2019-10-04 15:41:23 +02:00
Virginie Ky	53efb1269b	content manager filters ui	2019-10-04 15:23:50 +02:00
Alexandre Bodin	2d04d25097	v3.0.0-beta.16.8	2019-10-04 11:57:46 +02:00
cyril lopez	39988b3efb	Merge branch 'master' into develop	2019-10-03 10:47:25 +02:00
soupette	2dc5df9595	Fix #4127	2019-10-01 16:25:08 +02:00
Alexandre Bodin	dbd621e6d8	v3.0.0-beta.16.7	2019-10-01 12:15:48 +02:00
soupette	6f8b23d254	Fix conflicts	2019-09-27 16:26:09 +02:00
cyril lopez	3a4bb7fda5	Merge branch 'develop' into front/context-api	2019-09-27 15:44:15 +02:00
Alexandre Bodin	6305bee43b	v3.0.0-beta.16.6	2019-09-26 14:35:06 +02:00
Virginie Ky	11f3871af1	Bootstrap and fonts without sass	2019-09-24 18:42:08 +02:00
Alexandre BODIN	b3648ba4d9	Merge branch 'master' into chore/routing-x-forwarded	2019-09-24 10:04:19 +02:00