1813 Commits

Author	SHA1	Message	Date
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
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
Virginie Ky	3028183997	Fixes done	2019-12-02 19:20:55 +01:00
Virginie Ky	30d30cfbe4	UI fixes	2019-12-02 17:30:17 +01:00
Virginie Ky	dfc9288a1e	some many UI fixes	2019-11-29 20:16:33 +01:00
Virginie Ky	945906a819	Apply review ip	2019-11-29 15:14:21 +01:00
soupette	9377256cd0	Fix conflicts	2019-11-29 06:54:17 +01:00
Virginie Ky	a2e6427749	Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui	2019-11-28 19:24:10 +01:00
Virginie Ky	3067bf5e1c	design review	2019-11-28 19:23:10 +01:00
Aurélien Georget	1400764e73	Apply events to DZ and components	2019-11-28 16:37:38 +01:00
Aurélien Georget	c60975f983	Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui	2019-11-28 16:31:07 +01:00
Aurélien Georget	26dbbddaf1	Remove useless events and add new events	2019-11-28 16:30:49 +01:00
Virginie Ky	d83cbb4539	Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui	2019-11-28 15:59:45 +01:00
Aurélien Georget	8ca8d9bbc9	Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui	2019-11-28 15:58:23 +01:00
Aurélien Georget	367b1a0d1f	Apply events to improve the products	2019-11-28 15:57:39 +01:00
Virginie Ky	c47985cf9b	Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui	2019-11-28 15:57:06 +01:00
Virginie Ky	6baa56d9a1	PR review apply	2019-11-28 15:11:57 +01:00
Virginie Ky	0d8eda80bd	fortawesome dep	2019-11-28 14:15:04 +01:00
Alexandre Bodin	63abfc6db9	Merge branch 'develop' into features/dynamic-zones	2019-11-27 15:28:33 +01:00
Alexandre Bodin	49985eca53	Merge branch 'master' into develop	2019-11-27 15:28:06 +01:00
Virginie Ky	27bbef0ea2	ListView schema retrieve	2019-11-27 10:36:49 +01:00
Virginie Ky	da82c145e8	Input File errors and ui	2019-11-27 10:28:28 +01:00
Alexandre Bodin	3a0df72b4a	Fix hasPK & getPK	2019-11-26 18:19:52 +01:00
Alexandre Bodin	6804bd34b4	Fix not found content type in content manager routes	2019-11-26 17:18:43 +01:00
Alexandre Bodin	62237bcd08	Mongoose fix populate and support dynamic zone populate	2019-11-26 17:01:58 +01:00
Virginie Ky	8ea2b3bb1d	PR review apply	2019-11-26 16:55:21 +01:00
Virginie Ky	587e4450b7	PR review apply	2019-11-26 16:24:53 +01:00
Virginie Ky	683dc4b199	Dynamic zone UI fix and review apply	2019-11-26 16:15:59 +01:00
Virginie Ky	ce3ada140d	Unit tests fixes	2019-11-26 10:39:26 +01:00
Alexandre Bodin	9aff9af165	v3.0.0-beta.17.6	2019-11-25 18:54:50 +01:00
soupette	f9614eeb28	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dynamic-zones-ctb	2019-11-25 16:43:02 +01:00
Virginie Ky	c640f6872b	Icons grid adjustments	2019-11-25 15:56:44 +01:00
Virginie Ky	f36e8ac6f6	Dynamic zone Components UI fixes	2019-11-25 13:15:25 +01:00
Virginie Ky	06409c5211	Notification UI fix	2019-11-24 23:44:58 +01:00
soupette	d9ca6451d7	Add dynamic to edit a field	2019-11-22 11:18:49 +01:00
Virginie Ky	3e1779c896	Dynamic zones ui	2019-11-21 18:48:13 +01:00
Virginie Ky	7d1634cde6	ListView sorting fix	2019-11-21 16:49:06 +01:00
Virginie Ky	8174e9dae8	Input JSON UI with error	2019-11-21 15:06:38 +01:00
Virginie Ky	b35e5b022d	merge	2019-11-21 14:25:13 +01:00