6461 Commits

Author	SHA1	Message	Date
Alexandre Bodin	5d77a53c06	Merge branch 'main' into chore/rename-e2e-to-api	2022-11-07 16:29:37 +01:00
Josh	a881aa3ebb	fix: scroll to end of list when relations are updated	2022-11-07 14:16:30 +00:00
Josh	a60f265940	chore: update snapshots post text fixes	2022-11-07 14:07:54 +00:00
Josh	6cc51a06ae	test: add dnd tests for relation input and data manager	2022-11-07 12:59:38 +00:00
Josh	7f7d4efb14	test: update RelationItem and RelationList	2022-11-07 12:17:11 +00:00
Josh	5978ae5e7d	test: fix existing tests	2022-11-07 12:05:55 +00:00
Josh	102b842485	chore: tidy ups	2022-11-07 11:33:48 +00:00
Josh	3e39b41cdf	chore: remove debug line	2022-11-07 11:31:52 +00:00
Mark Kaylor	f3fb4ac061	Increase jest timeout	2022-11-07 12:30:16 +01:00
Josh	2b85ad0446	chore: remove passing id to relationItem useDrag/useDrop	2022-11-07 11:29:47 +00:00
Josh	ab5dac4ca2	refactor: repeatableComponents (make it simpler)	2022-11-07 11:29:03 +00:00
Josh	eef9fdb463	feat: add visual re-ordering with mouse	2022-11-07 10:52:14 +00:00
Simone Taeggi	42f055b746	fix comments and move warning logs	2022-11-07 11:19:27 +01:00
Mark Kaylor	f3ac07bbc9	Increase the timeout for all waitFor	2022-11-07 11:14:27 +01:00
Mark Kaylor	f33ec948fb	Add option to increase waitFor timeout	2022-11-07 10:46:19 +01:00
Mark Kaylor	85ae179071	Remove use of waitForElementToBeRemoved	2022-11-07 10:08:39 +01:00
Simone	f25a7d6801	Merge branch 'main' into enhancement/axios-refactoring	2022-11-07 09:43:37 +01:00
markkaylor	f194a68516	Merge branch 'main' into feature/custom-field-default-options	2022-11-07 09:11:08 +01:00
markkaylor	d8b26d3e79	Merge branch 'main' into feature/market-sort-filters	2022-11-07 09:07:57 +01:00
markkaylor	70870283ef	Merge branch 'main' into feature/marketplace-stats	2022-11-07 08:51:39 +01:00
Josh	6b6c3948aa	feat(wip): add visual reordering of relations	2022-11-04 17:36:35 +00:00
Gustav Hansen	c1de0e1f8d	Merge pull request #14784 from strapi/fix/settings-conditions-category ... ConditionsModal: Fix selection of multiple items in different categories	2022-11-04 17:56:46 +01:00
Convly	73b47a3901	v4.4.7	2022-11-04 16:52:57 +01:00
Gustav Hansen	a11193d13e	Merge pull request #14782 from strapi/fix/settings-conditions ... ConditionsModal: Fix modal component structure and add missing translations	2022-11-04 16:13:24 +01:00
Gustav Hansen	281e42ca02	Merge pull request #14785 from strapi/fix/react-select-box-shadow ... ReactSelect: Add missing box-shadow	2022-11-04 16:13:09 +01:00
Mark Kaylor	4d6593f4b4	Fix tests	2022-11-04 16:11:38 +01:00
Gustav Hansen	9877172266	Chore: Bump @strapi/design-system to 1.2.7	2022-11-04 15:02:38 +01:00
Gustav Hansen	01b68ddcb3	Chore: Update snapshot tests	2022-11-04 14:04:28 +01:00
Gustav Hansen	5548344aa8	ConditionsModal: Fix selection of multiple items in different categories	2022-11-04 13:28:56 +01:00
Mark Kaylor	679f333525	Merge branch 'main' of github.com:strapi/strapi into feature/market-sort-filters	2022-11-04 13:22:30 +01:00
Simone Taeggi	2bd1a06e9c	add deprecation warnings where we use axiosInstance	2022-11-04 12:07:21 +01:00
Mark Kaylor	ec58df979d	Merge main and update snapshot to resolve conflict	2022-11-04 11:34:34 +01:00
Gustav Hansen	006f1e317f	Chore: Update translation strings	2022-11-04 11:21:20 +01:00
Gustav Hansen	805ea73eb2	ConditionsModal: Fix translation strings	2022-11-04 11:21:17 +01:00
Gustav Hansen	d7fcb167fe	ConditionsModal: Fix modal component structure to use ModalBody	2022-11-04 11:16:23 +01:00
Simone Taeggi	8161eb9bf8	expose directly the http methods inside the new fetchClient utils	2022-11-04 10:36:53 +01:00
Gustav Hansen	c4cb546c89	Chore: update snapshot tests	2022-11-04 10:10:33 +01:00
Simone	3ceb13a0c8	Merge branch 'main' into enhancement/axios-refactoring	2022-11-04 10:05:01 +01:00
Gustav Hansen	be49a0c80b	RelationInput: Overwrite default react-select no-options message	2022-11-04 10:01:43 +01:00
Simone Taeggi	799c523f07	change the location of the fetchClient definition to the utils folder	2022-11-04 09:54:31 +01:00
Gustav Hansen	933f646a5a	Merge pull request #14777 from strapi/chore/upgrade-react-select ... Chore: Upgrade react-select from v4 to v5	2022-11-04 09:39:49 +01:00
Mark Kaylor	6d76f071ba	Remi feedback	2022-11-03 17:03:23 +01:00
Gustav Hansen	b8debd30b5	RelationInput: Stop testing react-select internals	2022-11-03 16:37:46 +01:00
Gustav Hansen	4a8d910afb	Chore: Update snapshot tests	2022-11-03 16:35:04 +01:00
Gustav Hansen	4b1c26e638	Chore: Remove react-select aliases from the webpack alias configuration	2022-11-03 16:35:04 +01:00
Gustav Hansen	55227eb94c	Chore: Update snapshot tests	2022-11-03 16:28:09 +01:00
Gustav Hansen	ff35857c96	RelationInput: Replace Badge with Status	2022-11-03 16:26:00 +01:00
Gustav Hansen	1e180f1961	CM: Replace custom State component with the DS Status component	2022-11-03 16:26:00 +01:00
Gustav Hansen	3079f38be5	Chore: Update snapshot tests	2022-11-03 15:02:16 +01:00
Jamie Howard	868fefd5e0	Merge branch 'main' of github.com:strapi/strapi into fix/relations/rel-error-handling	2022-11-03 14:02:06 +00:00