10860 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexandre Bodin	7c3f781081	Merge branch 'develop' into features/dynamic-zones	2019-12-10 13:51:00 +01:00
Alexandre Bodin	93ea08cc96	Merge branch 'master' into develop	2019-12-10 13:50:45 +01:00
Alexandre BODIN	b3f0eed9bf	Merge pull request #4696 from CKGrafico/patch-1 ... Fix environment typo	2019-12-10 13:49:40 +01:00
Quique Fdez Guerra	deb011dee1	Fix environment typo	2019-12-10 12:46:56 +01:00
soupette	15c6ec86d2	Update en trads	2019-12-10 12:27:17 +01:00
soupette	56826e4d3b	Clean translations files	2019-12-10 12:19:56 +01:00
Olli Rautiainen	f2d53bf078	change admin UI's default language to english	2019-12-10 12:49:07 +02:00
soupette	14b28843a0	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data	2019-12-10 11:28:04 +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	4136019d5f	Fix line background for dz	2019-12-09 22:39:50 +01:00
soupette	034070cc4c	Clean models	2019-12-09 19:10:27 +01:00
soupette	51d7a317bb	Clean code	2019-12-09 18:53:15 +01:00
soupette	207ddb54a0	Fix prod mode	2019-12-09 18:33:43 +01:00
soupette	ce22ca993c	Fix links to the ctm	2019-12-09 18:18:55 +01:00
soupette	456e36c1ce	Fix input file	2019-12-09 18:09:48 +01:00
soupette	959d45febf	Add warning before delete	2019-12-09 17:47:13 +01:00
soupette	d1d97e1751	Fix components baseline	2019-12-09 17:33:50 +01:00
soupette	fdc5f069bf	Fix baseline	2019-12-09 17:13:16 +01:00
Alexandre BODIN	8c3b5c2eaf	Merge pull request #4688 from strapi/docs/dynamic-zones ... Update documentation with dynamic zone feature	2019-12-09 16:40:09 +01:00
Jim LAURIE	679a928674	Fix typo	2019-12-09 16:38:41 +01:00
Jim LAURIE	bd628be155	Replace group by compo	2019-12-09 16:36:35 +01:00
Alexandre Bodin	63edb61336	Fix component name	2019-12-09 16:18:58 +01:00
Alexandre Bodin	de3c9e440d	Update documentation of api endpoints and queries	2019-12-09 14:54:16 +01:00
Alexandre Bodin	fc36055ff6	Add configurable as a valid api option	2019-12-09 14:53:30 +01:00
Alexandre BODIN	cf54c91fc1	Merge pull request #4687 from strapi/docs-typo ... Fix typo draft guide	2019-12-09 14:40:35 +01:00
Jim LAURIE	c0d6b304b0	Fix typo draft guide	2019-12-09 14:33:43 +01:00
soupette	aa6d83669f	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data	2019-12-09 14:06:29 +01:00
soupette	87869a18b4	Fix ui bugs	2019-12-09 14:06:18 +01:00
Alexandre Bodin	2fa574b061	Fix isComponent on null attributes	2019-12-09 14:01:11 +01:00
cyril lopez	be8d74bc89	Merge pull request #4686 from strapi/ctm-ui ... DZ CTM ui fixes	2019-12-09 11:55:01 +01:00
Alexandre Bodin	c5d57b32fe	Merge branch 'develop' into features/dynamic-zones	2019-12-09 11:48:46 +01:00
Virginie Ky	268a487039	Merge branch 'front/dz-post-data' of github.com:strapi/strapi into ctm-ui	2019-12-09 11:33:02 +01:00
soupette	2769f01a93	Fix tests	2019-12-09 11:31:47 +01:00
Virginie Ky	43f77b2d9c	Merge branch 'ctm-ui' of github.com:strapi/strapi into ctm-ui	2019-12-09 11:15:38 +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	5124718263	Merge pull request #4682 from RodEsp/patch-1 ... Alphabetize concepts/file-structure.md docs	2019-12-09 11:03:53 +01:00
Alexandre BODIN	4c0ae22fad	Merge branch 'master' into patch-1	2019-12-09 11:03:25 +01:00
virginieky	81a5c8eafe	Merge branch 'front/dz-post-data' into ctm-ui	2019-12-09 10:56:27 +01:00
Alexandre BODIN	39771f66df	Merge pull request #4668 from strapi/docs-security ... Add sqreen guide	2019-12-09 10:49:22 +01:00
Virginie Ky	b3845f4ea0	CTB leftmenu customlink plus button	2019-12-09 10:49:20 +01:00
Alexandre BODIN	8b032ab254	Merge branch 'master' into docs-security	2019-12-09 10:49:15 +01:00
Jim LAURIE	332ca2f5e0	Apply fix typo	2019-12-09 10:48:15 +01:00
Alexandre Bodin	fb5b770ce5	Merge branch 'master' into develop	2019-12-09 10:39:30 +01:00
Alexandre BODIN	b2b22d9380	Merge pull request #4623 from strapi/lauriejim-patch-1 ... Remove search engine for index.html page	2019-12-09 10:35:41 +01:00
Alexandre BODIN	f511ba99fd	Merge pull request #4351 from chriswinch/file-size-type-integer ... Fix uploaded file order by size	2019-12-09 10:35:31 +01:00
Jim LAURIE	c8d455d4e2	Add no index on production page	2019-12-09 10:27:59 +01:00
Jim LAURIE	1dfe036f87	Merge branch 'develop' into lauriejim-patch-1	2019-12-09 10:26:44 +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