2102 Commits

Author	SHA1	Message	Date
soupette	fc1cbbd753	Fix dz errors on change compo	2019-12-11 17:13:23 +01:00
soupette	e991f6ec7c	Fix min equal	2019-12-11 16:56:51 +01:00
soupette	1efde575ad	Fix conflicts	2019-12-11 16:53:45 +01:00
soupette	e29bd761e4	Fix CTM dz min max validations	2019-12-11 16:52:35 +01:00
Alexandre BODIN	ae98466076	Merge pull request #4698 from strapi/dynamic-zone/graphql-model-uid ... graphql use model uid	2019-12-11 15:27:01 +01:00
soupette	a8f593aeb9	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data	2019-12-11 13:52:11 +01:00
soupette	4eaff16858	Fix max on repeatable fields	2019-12-11 12:48:52 +01:00
Alexandre Bodin	780c35a14a	Add category info in content-manager	2019-12-11 12:19:48 +01:00
soupette	87c4de9183	Fix injected compos from ctb in ctm	2019-12-11 10:57:10 +01:00
Alexandre Bodin	b5cceb8760	Cleanup graphql and use model uids	2019-12-10 17:24:55 +01:00
soupette	98519d4f97	Remove commented code	2019-12-10 16:31:54 +01:00
soupette	875173cd00	Fix baseline	2019-12-10 15:54:36 +01:00
soupette	465fbea87f	Fix icons edition	2019-12-10 14:26:12 +01:00
soupette	56826e4d3b	Clean translations files	2019-12-10 12:19:56 +01:00
soupette	923aa6ceac	Fix icon color	2019-12-10 11:26:18 +01:00
soupette	0e83b1ad1d	Fix administrators and design	2019-12-10 11:11:55 +01:00
soupette	d9f75cb39c	Change injected components api and fix prod mod	2019-12-09 23:10:05 +01:00
soupette	456e36c1ce	Fix input file	2019-12-09 18:09:48 +01:00
Alexandre Bodin	c5d57b32fe	Merge branch 'develop' into features/dynamic-zones	2019-12-09 11:48:46 +01:00
Virginie Ky	bdff39020c	Merge branch 'front/dz-post-data' of github.com:strapi/strapi into ctm-ui	2019-12-09 11:14:42 +01:00
Alexandre Bodin	fb5b770ce5	Merge branch 'master' into develop	2019-12-09 10:39:30 +01:00
soupette	16831c29f9	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data	2019-12-09 10:12:28 +01:00
Alexandre BODIN	6bf4cfd65b	Merge branch 'master' into master	2019-12-09 10:11:05 +01:00
Virginie Ky	d80cc1c898	CM UI fixes	2019-12-06 18:27:07 +01:00
soupette	305ed06634	Change trash icon	2019-12-06 17:11:17 +01:00
Alexandre Bodin	f5a9494cb8	Remove certain content types from ctm list	2019-12-06 16:18:35 +01:00
soupette	9967a30932	Clean logs	2019-12-06 15:14:59 +01:00
soupette	30c70deb3b	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data	2019-12-06 14:38:32 +01:00
Alexandre Bodin	29c06e10a3	Merge branch 'develop' into features/dynamic-zones	2019-12-06 12:35:35 +01:00
Alexandre Bodin	b4c6c4f271	Merge branch 'master' into develop	2019-12-06 12:35:22 +01:00
Alexandre Bodin	2bf3533c85	Merge branch 'master' into develop	2019-12-06 12:34:26 +01:00
soupette	df0e8951ea	fix component display name	2019-12-06 11:37:58 +01:00
soupette	c001fe1f3d	Remove i tags	2019-12-06 11:09:48 +01:00
soupette	3570ce43e2	Fix source issue	2019-12-06 10:44:27 +01:00
soupette	2b85c97c0e	Fix conflicts	2019-12-06 09:08:12 +01:00
soupette	7b6a24c99e	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dynamic-zones-ctb-listview	2019-12-06 08:59:27 +01:00
Alexandre BODIN	9d571beeac	Merge pull request #4658 from strapi/chore/split-date-types ... Chore/split date types	2019-12-05 16:55:17 +01:00
Alexandre Bodin	c469345f35	Fix test conflicts	2019-12-05 16:03:45 +01:00
Alexandre Bodin	c66fe82c41	Handle time and date in mongo	2019-12-05 15:26:01 +01:00
soupette	94bd80b59a	Add production mode to ctb	2019-12-05 11:59:23 +01:00
Alexandre Bodin	dd072c40c3	Refactor column creation to use plain knex schema builder	2019-12-05 11:37:07 +01:00
cyril lopez	36cad7e3d3	Merge branch 'master' into master	2019-12-04 23:08:28 +01:00
Alexandre Bodin	909266232f	Add tests on datetime	2019-12-04 18:49:47 +01:00
soupette	bdf708d6eb	Fix conflicts	2019-12-04 18:31:55 +01:00
soupette	dd5fd750cb	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dynamic-zones-ctb-listview	2019-12-04 18:27:50 +01:00
Virginie Ky	8a9f8007a8	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dynamic-zones-ctb-listview	2019-12-04 18:05:14 +01:00
Alexandre Bodin	95c7a515d7	Split parser and formatter in specific files	2019-12-04 17:49:13 +01:00
soupette	da065210b5	Update app menu	2019-12-04 10:54:57 +01:00
harimkims	5f62dbc9a5	Update KO translation	2019-12-04 17:08:08 +09:00
Virginie Ky	3028183997	Fixes done	2019-12-02 19:20:55 +01:00