10860 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Virginie Ky	3067bf5e1c	design review	2019-11-28 19:23:10 +01:00
Alexandre Bodin	7a3b64016c	Hotfix mongo aggregate policy verifications	2019-11-28 18:33:02 +01:00
Alexandre BODIN	cc5b863c35	Merge pull request #4622 from strapi/dynamic-zone/graphql-support ... Support dynamic zones in graphql	2019-11-28 18:18:22 +01:00
soupette	a203d85918	Add logic to know if wheter or not we can add a component into another component	2019-11-28 17:40:51 +01:00
Alexandre Bodin	53d02ea443	Support empty dynamic zone	2019-11-28 17:34:27 +01:00
Alexandre Bodin	e4226344ee	simplify code	2019-11-28 17:34:27 +01:00
Alexandre Bodin	db08e93cc7	Support dynamic zones in graphql	2019-11-28 17:34:26 +01:00
Alexandre Bodin	05cfd05c10	Merge branch 'develop' into features/dynamic-zones	2019-11-28 17:33:58 +01:00
Alexandre Bodin	ce53715714	Merge branch 'master' into develop	2019-11-28 17:33:40 +01:00
Jim LAURIE	f36a5cf096	Merge pull request #4584 from sulakin/admin-russian-translation ... Update Russian translation for admin panel	2019-11-28 16:51:32 +01:00
Jim LAURIE	c7d20d0358	Merge branch 'master' into admin-russian-translation	2019-11-28 16:51:15 +01:00
soupette	248ebc372b	Created util to retrieve all nested components	2019-11-28 16:48:51 +01:00
Aurélien Georget	1400764e73	Apply events to DZ and components	2019-11-28 16:37:38 +01:00
soupette	ff6e2484dd	Handle edit component attribute	2019-11-28 16:34:24 +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
Jim LAURIE	54cd208221	Remove search engine for index.html page	2019-11-28 16:26:23 +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
soupette	0c67107294	Fix icons loading and add react-fontawesome lib	2019-11-28 15:52:24 +01:00
Virginie Ky	6baa56d9a1	PR review apply	2019-11-28 15:11:57 +01:00
soupette	28aecbae74	Add components to dynamic zone	2019-11-28 15:10:59 +01:00
Virginie Ky	0d8eda80bd	fortawesome dep	2019-11-28 14:15:04 +01:00
soupette	3fc5c8fda9	Created multi menu list for adding compo to a dz	2019-11-28 13:11:55 +01:00
Jim LAURIE	d1326aa35a	Merge pull request #4620 from strapi/docs-ga ... Add GA in the docs	2019-11-28 11:53:25 +01:00
Jim LAURIE	2e6d0c7f41	Add GA in the docs	2019-11-28 11:45:45 +01:00
Virginie Ky	c7c9df6ef1	merge	2019-11-28 11:04:51 +01:00
Virginie Ky	6d301e0428	ListView UI ip	2019-11-28 11:01:47 +01:00
Alexandre BODIN	24fde718db	Merge pull request #4619 from strapi/revert-4614-docs-warning-alpha ... Revert "Revert docs update"	2019-11-28 10:47:42 +01:00
Jim LAURIE	e0b96b9738	Revert "Revert docs update"	2019-11-28 10:43:33 +01:00
soupette	455f90000f	Handle add created component to dz	2019-11-28 09:59:53 +01:00
Alexandre BODIN	a6115daab5	Merge pull request #4600 from strapi/docs-website-link ... Fix docs website link in the top menu	2019-11-28 09:00:19 +01:00
Alexandre BODIN	0cc737145e	Merge branch 'master' into docs-website-link	2019-11-28 09:00:11 +01:00
Sulakin Vadim	c516051b3f	Merge branch 'master' into admin-russian-translation	2019-11-28 09:27:14 +03:00
soupette	f32a478f6c	Init DZ add component	2019-11-27 18:26:36 +01:00
Jim LAURIE	b2e99a3e20	Merge pull request #4614 from strapi/docs-warning-alpha ... Revert docs update	2019-11-27 18:14:07 +01:00
Jim LAURIE	fd66ffb337	Merge branch 'master' into docs-warning-alpha	2019-11-27 18:14:00 +01:00
Jim LAURIE	11addd3485	Revert docs update	2019-11-27 18:13:18 +01:00
Jim LAURIE	f0766e5b7f	Merge pull request #4613 from strapi/docs-warning-alpha ... Fix docs build	2019-11-27 18:06:22 +01:00
Jim LAURIE	d0563e8d38	Merge branch 'master' into docs-warning-alpha	2019-11-27 18:06:15 +01:00
Jim LAURIE	885f7c63f9	Fix docs build	2019-11-27 18:05:21 +01:00
Alexandre BODIN	56d359fd97	Merge pull request #4612 from strapi/docs-warning-alpha ... Display a deprecated message docs alpha	2019-11-27 17:30:09 +01:00
Alexandre BODIN	2f3cd26acc	Merge branch 'master' into docs-warning-alpha	2019-11-27 17:30:00 +01:00
soupette	6b49fa778f	Add code explanations and refacto drastically the code so it is more understandable	2019-11-27 17:29:41 +01:00
Jim LAURIE	6a2b667b74	Fix ;	2019-11-27 17:28:08 +01:00
Jim LAURIE	93130a1676	Display a deprecated message docs alpha	2019-11-27 17:26:30 +01:00
Alexandre BODIN	ad3cd2ee94	Merge pull request #4611 from strapi/docs-deploy-docker ... Add a docker ref in the docs	2019-11-27 16:36:43 +01:00
Alexandre BODIN	1f7688cb77	Merge branch 'master' into docs-deploy-docker	2019-11-27 16:36:34 +01:00