36133 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Simone Taeggi	7eefdb1053	Merge branch 'fix/sso-lock-out-option' of github.com:strapi/strapi into fix/sso-lock-out-option	2023-05-28 23:18:27 +02:00
Simone Taeggi	45b9631494	add useSettingsForm get test	2023-05-28 23:18:21 +02:00
DMehaffy	08ff46ddc4	Merge branch 'main' into chore/replace-node-14-with-20	2023-05-26 11:48:10 -07:00
“marwa-hodeib”	48234303cc	fix variable translation	2023-05-26 21:26:32 +03:00
Convly	489e422f60	Revert breaking change & adapt the feature behavior	2023-05-26 18:15:55 +02:00
Marc-Roig	31afc24ee5	fix: unit tests	2023-05-26 17:57:23 +02:00
Convly	0b15df5850	Merge branch 'ts-support-2/type-system' into ts-support-2/update-type-gen	2023-05-26 17:56:08 +02:00
Convly	9b8fb00e8d	Merge branch 'main' into ts-support-2/update-type-gen	2023-05-26 17:52:06 +02:00
Marc-Roig	e73a41ecde	todo: handle dz and morph relations in getQueryPopulate	2023-05-26 17:47:59 +02:00
Convly	2eb6b5c44b	Merge branch 'main' into features/ts-support-2	2023-05-26 17:43:58 +02:00
Convly	2a75f0bff1	Merge branch 'main' into ts-support-2/type-system	2023-05-26 17:43:35 +02:00
Marc-Roig	810efff6da	fix: use is nil for countRelations	2023-05-26 17:37:33 +02:00
Marc-Roig	9a7bef24bf	chore: PR proposed changes	2023-05-26 17:26:55 +02:00
Convly	94e3595718	Move utils to namespaces & fix types	2023-05-26 17:14:07 +02:00
Marc	832b4aa46d	Update packages/core/content-manager/server/controllers/collection-types.js ... Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>	2023-05-26 16:11:33 +02:00
Marc	8adcef6029	Update examples/getstarted/src/index.js ... Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>	2023-05-26 16:08:40 +02:00
Convly	f0841f681d	Merge branch 'ts-support-2/type-system' into ts-support-2/update-type-gen	2023-05-26 15:46:12 +02:00
Convly	2cdc6b07a3	Rename Contains to Includes	2023-05-26 15:33:09 +02:00
Convly	90b5fa8d55	Rename AssertNamespaceIs to EnsureNamespaceMatches for uids	2023-05-26 15:30:42 +02:00
Convly	1b506673a1	Use ColonsSeparator for api & plugin namespace (origin <> scope)	2023-05-26 15:27:45 +02:00
Jamie Howard	4020a96da6	chore: separate validation between webhook service and controller	2023-05-26 14:27:44 +01:00
Convly	b30a3b426f	Update ControllerHandler return type to accept void	2023-05-26 15:26:36 +02:00
Convly	9bd29e3d9b	Update data transfer code to adapt with new types	2023-05-26 15:25:12 +02:00
Jamie Howard	5547c788eb	fix: register review workflow webhook events earlier in bootstrap	2023-05-26 14:25:03 +01:00
Convly	9fca32a25e	Update data transfer types	2023-05-26 15:23:50 +02:00
Gustav Hansen	943497a7d9	Merge pull request #16843 from strapi/chore/update-ds ... Chore: Update @strapi/design-system and @strapi/icons to 1.7.9	2023-05-26 15:20:50 +02:00
Gustav Hansen	bd217c1970	Chore: Update @strapi/design-system and @strapi/icons to 1.7.9	2023-05-26 14:58:19 +02:00
Marc-Roig	619823e72f	doc: transaction is an experimental feature	2023-05-26 14:48:01 +02:00
Gustav Hansen	0b5dbcf9de	Chore: Update snapshots	2023-05-26 14:45:47 +02:00
Marc-Roig	00b166d439	fix: single types unit test	2023-05-26 14:45:22 +02:00
Bassel Kanso	90032a791f	Merge branch 'main' into fix/transfer-push-stuck	2023-05-26 15:43:43 +03:00
Bassel	a862150325	refactoring using default message retry options	2023-05-26 15:42:03 +03:00
Ben Irvin	f6a95493d0	Merge pull request #16842 from strapi/fix/dts-stream-filters	2023-05-26 14:03:42 +02:00
Marc-Roig	450b9fd7cf	chore: remove jsdoc unnecessary return	2023-05-26 13:21:53 +02:00
Marc-Roig	ee59206428	chore: document getQueryPopulate	2023-05-26 13:19:37 +02:00
Marc-Roig	fabe6c7c71	chore: document populate builder	2023-05-26 13:17:48 +02:00
Marc-Roig	ee5d821fa7	chore: cleanup comments	2023-05-26 13:05:08 +02:00
Ben Irvin	2f1ac2777e	remove comment	2023-05-26 12:51:03 +02:00
Gustav Hansen	94e4147c4d	Chore: Update snapshot tests	2023-05-26 12:50:45 +02:00
Gustav Hansen	052bdaab64	Chore: Update @strapi/design-system and @strapi/icons to 1.7.8	2023-05-26 12:48:48 +02:00
Marc-Roig	ba845dd0ac	chore: update entity manager types	2023-05-26 12:37:52 +02:00
Marc-Roig	f8f0b75185	feat: populateFromQuery	2023-05-26 12:35:22 +02:00
Marc-Roig	f41e29c40b	feat: populate in relations and single types	2023-05-26 12:34:18 +02:00
Marc-Roig	a9efdd0771	feature: populate from query	2023-05-26 12:34:00 +02:00
Ben Irvin	b2e2d3f4c8	fix imports	2023-05-26 11:42:17 +02:00
Ben Irvin	c0af9ae786	use chain to fix broken piping ... Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>	2023-05-26 11:30:40 +02:00
smoothdvd	64fdf06130	Update zh-Hans.json to fix issue of 'The intl string context variable "br" was not provided to the string'	2023-05-26 10:40:00 +08:00
Jamie Howard	9d2617a22a	fix: revert to inline layout	2023-05-25 17:04:49 +01:00
Jamie Howard	ca9345e70c	chore(webhooks/EditView): code cleanup	2023-05-25 16:50:00 +01:00
Simone Taeggi	a06a9b8fe8	Merge branch 'main' into fix/sso-lock-out-option	2023-05-25 17:18:33 +02:00