6731 Commits

Author SHA1 Message Date
markkaylor
70870283ef
Merge branch 'main' into feature/marketplace-stats 2022-11-07 08:51:39 +01:00
Cooper Floyd
7c919b1e79 prevent caption and alternativeText from automatically populating with file name on upload 2022-11-04 13:48:23 -05: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
Jamie Howard
2b56063804 test(entity-validator): test all relation validation cases 2022-11-04 16:33:34 +00:00
Ben Irvin
35e742505d Merge branch 'features/deits' into deits/cli-import 2022-11-04 17:22: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
Convly
4dcfe4ab40 (tmp) init morph populate 2022-11-04 15:06:36 +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
7b706dbf5a ReactSelect: Cleanup style props 2022-11-04 13:58:04 +01:00
Gustav Hansen
fe8012279a ReactSelect: Add subtle box-shadow around menu 2022-11-04 13:57:44 +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
Ben Irvin
0d2979ca1f let commander handle filename args 2022-11-04 12:10:04 +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
Ben Irvin
8ecf0f48bb update encrypt command notes 2022-11-04 10:18:09 +01:00
Ben Irvin
4377a53106 fix maxSize NaN 2022-11-04 10:16:28 +01:00
Gustav Hansen
c4cb546c89 Chore: update snapshot tests 2022-11-04 10:10:33 +01:00
Gustav Hansen
be49a0c80b RelationInput: Overwrite default react-select no-options message 2022-11-04 10:01:43 +01:00
Convly
dd2624fd02 Merge branch 'features/deits' of github.com:strapi/strapi into deits/export-project-configuration 2022-11-04 09:40:55 +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
Ben Irvin
2eb6198a12 remove log 2022-11-04 09:14:38 +01:00
Ben Irvin
e6eb5cc8ce fix bytes in mb 2022-11-04 08:42:29 +01:00
Ben Irvin
c10570a047 use filename provided instead of output option 2022-11-04 08:41:19 +01:00
Ben Irvin
81891095a9 remove input/output options 2022-11-04 08:36:16 +01:00
Ben Irvin
d82e54ea94 fix comment 2022-11-04 08:35:14 +01:00
Jamie Howard
3abbc7f89f fix: support all relation connection formats 2022-11-03 16:20:06 +00: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
a1a0e8741e Chore: Remove ReactSelectAsync component 2022-11-03 16:35:04 +01:00
Gustav Hansen
019cbf8123 Chore: Upgrade react-select from v4 to v5 2022-11-03 16:30:20 +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
Ben Irvin
e2dc9b2a64 fix maxSizeJsonl 2022-11-03 15:48:23 +01:00
Ben Irvin
9253a9c4c7 refactor commands 2022-11-03 15:36:23 +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
Jamie Howard
6aa6f394fe fix(entity-validator): support all relation formats 2022-11-03 12:35:42 +00:00
Gustav Hansen
148ff34c53 Chore: Update @Strapi/design-system to 1.2.6 2022-11-03 13:30:19 +01:00
Ben Irvin
79a47194f8 move utils to a file 2022-11-03 12:53:33 +01:00
Ben Irvin
839c586c93 comments 2022-11-03 12:38:34 +01:00