10620 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexandre BODIN	953b1d1469	Merge pull request #4736 from strapi/enhance/plugins ... Change the PluginHeader in all plugins	2019-12-17 11:27:55 +01:00
soupette	c04ba4b987	Update buffet	2019-12-17 11:02:40 +01:00
soupette	af6ec6db03	Add some built-in js object names in ct reserved names ... Fixes #4554	2019-12-17 10:52:50 +01:00
soupette	22d877a43c	Merge branch 'enhance/plugins' of github.com:strapi/strapi into enhance/plugins	2019-12-17 10:35:33 +01:00
soupette	3dc23d9ffc	Fix PR feedback	2019-12-17 10:20:30 +01:00
soupette	9f28c6b8c2	Fix conflicts	2019-12-17 10:20:03 +01:00
Alexandre BODIN	fd403a15aa	Merge pull request #4724 from strapi/clean-assets ... Clean assets in plugins	2019-12-17 10:15:52 +01:00
Alexandre BODIN	e35a0ea95a	Merge branch 'develop' into enhance/plugins	2019-12-17 10:06:53 +01:00
Alexandre BODIN	a9ff593b73	Merge branch 'develop' into clean-assets	2019-12-17 09:12:22 +01:00
Alexandre Bodin	cfe625f90e	Add polymorphic relation to bare populates	2019-12-17 09:11:49 +01:00
soupette	5c2893a6dd	Remove useless test	2019-12-16 17:53:42 +01:00
soupette	f442786fa8	Merge branch 'develop' of github.com:strapi/strapi into enhance/plugins	2019-12-16 17:52:04 +01:00
soupette	a27e1db638	Add header in admin containers	2019-12-16 17:50:35 +01:00
soupette	9e64bc095a	Fix NotFound compo	2019-12-16 17:38:19 +01:00
soupette	e302b210b3	Remove coming soon page	2019-12-16 17:36:30 +01:00
soupette	326f543f48	Fix baseline and migrate to buffetjs header	2019-12-16 17:33:06 +01:00
soupette	69c637d27b	Add plugin header from buffet to users plugin hp	2019-12-16 16:54:45 +01:00
soupette	58f9ac440a	Add header from buffet in documentation plugin	2019-12-16 16:44:25 +01:00
soupette	bffffe4bb0	Change header in upload and email plugins	2019-12-16 16:31:04 +01:00
cyril lopez	8d8cc0ffbc	Merge branch 'develop' into clean-assets	2019-12-16 15:58:29 +01:00
soupette	bcd9db9987	Migrate upload plugin header to buffet s one	2019-12-16 15:56:42 +01:00
soupette	d6045876a7	Change plugin header in plugin upload	2019-12-16 15:47:44 +01:00
soupette	7bc4d87e36	Fixes #4629	2019-12-16 15:06:51 +01:00
Alexandre Bodin	f8d8b76fad	Merge branch 'master' into develop	2019-12-16 15:06:12 +01:00
Alexandre BODIN	76df41f967	Merge pull request #4726 from strapi/docs-update-qs-compo ... Tutorial update for compo	2019-12-16 14:38:27 +01:00
Alexandre BODIN	6e2b6f4864	Merge branch 'develop' into docs-update-qs-compo	2019-12-16 14:38:20 +01:00
Alexandre BODIN	358b8be5e2	Merge pull request #4733 from franciskone/patch-1 ... Update configurations.md	2019-12-16 14:33:30 +01:00
Alexandre Bodin	90db5092b4	populate bare associations to avoid circular populating	2019-12-16 14:10:20 +01:00
soupette	dbc988f914	Fix PR feedback	2019-12-16 11:54:47 +01:00
cyril lopez	4c1cb3b7e8	Merge branch 'develop' into clean-assets	2019-12-16 11:49:32 +01:00
Alexandre BODIN	e09624e5ef	Merge pull request #4712 from strapi/chore/dynamic-zone-tests ... CTM dynamic zone tests	2019-12-16 09:08:00 +01:00
Francesco Cappelli	9435fd703c	Update configurations.md ... added a typo fix	2019-12-15 22:57:26 +00:00
Jim LAURIE	f5800121ae	Merge branch 'develop' into docs-update-qs-compo	2019-12-13 23:48:15 +01:00
Jim LAURIE	40a9fb7d3d	Update type	2019-12-13 23:46:09 +01:00
Jim LAURIE	98c3e4b7cf	Update all tuto images	2019-12-13 23:15:57 +01:00
cyril lopez	8b4c247ccc	Merge branch 'develop' into clean-assets	2019-12-13 18:13:50 +01:00
soupette	28986d26cc	Fixes #4429	2019-12-13 18:11:34 +01:00
soupette	0511a54209	Remove useless assets in plugins	2019-12-13 16:15:25 +01:00
soupette	2aaf29edda	Clean assets	2019-12-13 15:52:23 +01:00
Alexandre BODIN	426bb27659	Merge branch 'develop' into chore/dynamic-zone-tests	2019-12-13 12:12:40 +01:00
Alexandre Bodin	6120c645e3	Fix fk name too long	2019-12-13 11:50:14 +01:00
Alexandre Bodin	4dbbf5722b	Add a warning about file names	2019-12-13 11:30:12 +01:00
Alexandre Bodin	d75d46b044	Add with media tests	2019-12-13 11:14:40 +01:00
Alexandre Bodin	3c4b411430	Add delete test	2019-12-13 10:43:40 +01:00
Alexandre Bodin	b62d664b60	Add edition tests	2019-12-13 10:43:39 +01:00
Alexandre Bodin	472ec83506	List test	2019-12-13 10:43:39 +01:00
Alexandre Bodin	721ad15633	Init dz tests	2019-12-13 10:43:38 +01:00
Alexandre Bodin	4d4d9c351d	Change csp config	2019-12-12 19:13:48 +01:00
Alexandre BODIN	417cbb218d	Merge pull request #4716 from strapi/features/dynamic-zones ... Add dynamic zones feature	2019-12-12 18:14:44 +01:00
Alexandre Bodin	4734d63308	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into features/dynamic-zones	2019-12-12 17:45:57 +01:00