13206 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexandre Bodin	eb78c029f1	Merge branch 'master' into develop	2019-12-12 14:08:08 +01:00
Alexandre BODIN	2ac9b25d10	Merge pull request #4705 from strapi/chore/upgrade-mongoose ... Upgrade mongoose version	2019-12-12 14:07:21 +01:00
Alexandre BODIN	882cb73b87	Merge pull request #4694 from 0LL1/admin-ui-language-fix ... Change admin UI's default language to English if browser's preferred language is not found	2019-12-12 14:05:38 +01:00
cyril lopez	cd29648fd9	Merge branch 'master' into admin-ui-language-fix	2019-12-12 12:51:18 +01:00
soupette	421cee19af	Fix design	2019-12-12 12:27:10 +01:00
soupette	3ed415963c	Fix PR feedback	2019-12-11 17:49:12 +01:00
soupette	d0952e5188	Fix ctb button link for components	2019-12-11 17:43:28 +01:00
soupette	ee9af6c0d3	Fix select description	2019-12-11 17:37:31 +01:00
soupette	fc1cbbd753	Fix dz errors on change compo	2019-12-11 17:13:23 +01:00
Alexandre Bodin	243ed2939b	Upgrade mongoose version	2019-12-11 17:03:53 +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	c8dbacbba4	Fix mongo ref need an id instead of an object	2019-12-11 16:38:57 +01:00
cyril lopez	4ad9fdef52	Merge pull request #4704 from strapi/admin/webpack-config ... Admin/webpack config	2019-12-11 15:27:29 +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	0cf28d89a6	Remove image-webpack-loader dep	2019-12-11 14:34:04 +01:00
soupette	d9cc5c7276	Merge branch 'front/dz-post-data' of github.com:strapi/strapi into admin/webpack-config	2019-12-11 14:30:37 +01:00
soupette	2f1aa08084	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data	2019-12-11 14:27:32 +01:00
soupette	d2e0999217	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into admin/webpack-config	2019-12-11 14:23:59 +01:00
Alexandre Bodin	a9cef57687	Lower case policy controller name	2019-12-11 14:23:45 +01:00
Alexandre Bodin	1791c19155	Fix globalPolicy controller key	2019-12-11 14:22:53 +01:00
soupette	02600b4b31	Merge branch 'front/dz-post-data' of github.com:strapi/strapi into admin/webpack-config	2019-12-11 14:14:35 +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
soupette	667fea4b99	Update webpack config	2019-12-11 12:43:07 +01:00
Alexandre Bodin	780c35a14a	Add category info in content-manager	2019-12-11 12:19:48 +01:00
Jim LAURIE	3e737f928b	Guide API token	2019-12-11 12:14:06 +01:00
soupette	9d72d7373e	Fix left menu link on safari	2019-12-11 11:13:53 +01:00
soupette	87c4de9183	Fix injected compos from ctb in ctm	2019-12-11 10:57:10 +01:00
Alexandre BODIN	793d2dbfe9	Merge pull request #4702 from strapi/dynamic-zone/cleanup ... Dynamic zone/cleanup	2019-12-11 10:40:44 +01:00
soupette	92ecb3eccd	Fix leftmenu count span	2019-12-11 10:31:19 +01:00
Alexandre Bodin	a503c20353	Cleanup strapi-utils	2019-12-11 10:22:47 +01:00
soupette	9dc685ced5	Made some fixes for safari	2019-12-10 17:27:34 +01:00
Alexandre Bodin	bdd0a08ecb	Prevent creation of special keys	2019-12-10 17:24:55 +01:00
Alexandre Bodin	5b01448dac	Return __contentType field in morph related fields	2019-12-10 17:24:55 +01:00
Alexandre Bodin	b5cceb8760	Cleanup graphql and use model uids	2019-12-10 17:24:55 +01:00
Alexandre Bodin	9b5bc9c367	Fix manyWay deep filtering	2019-12-10 17:24:25 +01:00
Alexandre Bodin	0ba3d9d7de	Merge branch 'develop' into features/dynamic-zones	2019-12-10 16:50:07 +01:00
Alexandre Bodin	e7444474f0	Merge branch 'master' into develop	2019-12-10 16:49:54 +01:00
Alexandre BODIN	f822a4d279	Merge pull request #4697 from strapi/fix/administrator-no-role-relation ... Remove populate role on non existing relation breaking mongoose	2019-12-10 16:49:24 +01:00
Alexandre Bodin	03193acf4f	Remove populate role on non existing relation breaking mongoose	2019-12-10 16:45:53 +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
Alexandre Bodin	3446b7f577	wip	2019-12-10 14:21:20 +01:00
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