30539 Commits

Author SHA1 Message Date
Simone Taeggi
dba8fc5312 Merge branch 'enhancement/axios-migration-step-1-refactor' of github.com:strapi/strapi into enhancement/axios-migration-step-1-refactor 2023-01-16 14:49:58 +01:00
Simone Taeggi
766adb72b4 fix path 2023-01-16 14:49:52 +01:00
Bassel
6572478897 Merge branch 'main' into features/deits 2023-01-16 15:08:09 +02:00
Josh
ac1374f249
Merge pull request #15460 from strapi/fix/relation-cursors 2023-01-16 13:01:52 +00:00
Josh
00cf8c87de Merge branch 'feature/relations-reordering' of https://github.com/strapi/strapi into feature/relations-reordering 2023-01-16 13:00:58 +00:00
Josh
0f3b1c090d Merge branch 'main' into feature/relations-reordering 2023-01-16 13:00:50 +00:00
Josh
09d05be44c
Merge pull request #15459 from strapi/fix/relations-with-long-names-shouldnt-break-drag-preview 2023-01-16 13:00:28 +00:00
Simone
cb7421c35c
Merge branch 'main' into enhancement/axios-migration-step-1-refactor 2023-01-16 13:55:21 +01:00
Josh
194e9dae52 chore: update snapshot 2023-01-16 12:53:20 +00:00
Bassel Kanso
d5f15509b0
Merge branch 'main' into chore/transactions 2023-01-16 14:52:50 +02:00
Josh
0c897257f6
Merge pull request #15440 from strapi/dependabot/npm_and_yarn/core-js-3.27.1 2023-01-16 12:41:58 +00:00
Josh
990ffe47e6 fix: use all-scroll on IconButton 2023-01-16 12:21:32 +00:00
Josh
55e627440d fix: use box to contain ellipse 2023-01-16 12:17:05 +00:00
Marc
62255e7512
Merge branch 'main' into fix/components-ordering-mysql 2023-01-16 13:05:58 +01:00
Marc-Roig
49843ed722 update entity 1 component order properly 2023-01-16 13:05:13 +01:00
Josh
f2069063a2
Merge pull request #15458 from strapi/fix/block-unallowed-types-in-media-input 2023-01-16 11:57:52 +00:00
Bassel Kanso
4222873e90
Merge branch 'main' into v4/generator-migration 2023-01-16 13:30:27 +02:00
Christian Capeans
e565648688 Merge branch 'main' into tracking-system-ct-components-dz 2023-01-16 12:10:07 +01:00
Simone Taeggi
908cc96965 Merge branch 'main' into enhancement/axios-migration-step-1-refactor 2023-01-16 12:07:06 +01:00
Julie Plantey
e545520bf3 chore: remove unnecessary comment 2023-01-16 12:05:40 +01:00
Simone Taeggi
011d1ea1ed add the link to contributor doc in the helper plugin readme 2023-01-16 12:05:33 +01:00
Josh
5ca6ae551f
Merge branch 'main' into dependabot/npm_and_yarn/core-js-3.27.1 2023-01-16 11:00:28 +00:00
Julie Plantey
65ac616473 refactor with Initials in CellContent 2023-01-16 11:59:09 +01:00
Julie Plantey
828815e745 Merge branch 'main' of https://github.com/strapi/strapi into enh/ML-listview-video-preview 2023-01-16 11:48:32 +01:00
Gustav Hansen
03f3033e5f
Merge pull request #15428 from strapi/chore/ds-1.4.2
[chore] Bump DS to 1.4.2
2023-01-16 11:45:01 +01:00
Gustav Hansen
eaae087758
Merge pull request #15419 from strapi/dependabot/npm_and_yarn/fingerprintjs/fingerprintjs-3.3.6
chore(deps): bump @fingerprintjs/fingerprintjs from 3.3.3 to 3.3.6
2023-01-16 11:44:29 +01:00
Gustav Hansen
1898626884
Merge pull request #15421 from strapi/chore/axios-1-2-2
Chore: Update axios to 1.2.2
2023-01-16 11:43:42 +01:00
Josh
7de920548e chore: use getTrad so react-intl works 2023-01-16 10:43:20 +00:00
Josh
89e6107ffe
Merge pull request #15451 from FabienGreard/main
Fix https://github.com/strapi/strapi/issues/15275
2023-01-16 09:53:17 +00:00
Josh
7e5bb3b333 fix: filter dropped files before trying to upload 2023-01-16 09:47:15 +00:00
Bassel Kanso
6f8f46cbef
Merge branch 'main' into v4/generator-migration 2023-01-16 11:32:56 +02:00
Julie Plantey
6960c988be Merge branch 'main' of https://github.com/strapi/strapi into features/authLogo 2023-01-16 10:30:23 +01:00
Josh
88ba54592b
Merge pull request #15369 from strapi/chore/add-browserlist 2023-01-16 09:29:10 +00:00
Julie Plantey
d8d6bb5b3c Merge branch 'main' of https://github.com/strapi/strapi into chore/ds-1.4.2 2023-01-16 10:18:18 +01:00
Simone Taeggi
e815f52a77 Merge branch 'main' into enhancement/axios-migration-step-1-refactor 2023-01-16 10:10:21 +01:00
Josh
032a4a37c0
Merge branch 'main' into main 2023-01-16 09:08:08 +00:00
Josh
133fb98587
Merge branch 'main' into chore/add-browserlist 2023-01-16 09:07:44 +00:00
Simone
33a05a973e
Merge pull request #15436 from strapi/fix/solve-snapshots-tests-failing-node-18
Fix/solve snapshots tests failing node 18
2023-01-16 10:07:09 +01:00
Josh
9fef47af32 chore: update snapshots 2023-01-16 08:53:35 +00:00
Simone Taeggi
32892c2a3e add a comment to highlight why we mocked react-intl 2023-01-16 09:46:43 +01:00
Bassel
f7e0cc73b1 remove options from transactions api 2023-01-16 10:44:06 +02:00
Ben Irvin
8d8a97aed8 pass only and exclude options to engine 2023-01-16 09:30:52 +01:00
Bassel Kanso
c82da95e89
Merge branch 'main' into chore/transactions 2023-01-16 10:09:48 +02:00
FabienGreard
da11558253 fix(VideoAssetCard): dissalow pointer-events on videoPreview 2023-01-14 15:25:59 +01:00
Simone Taeggi
731ec0de89 Merge branch 'main' into fix/solve-snapshots-tests-failing-node-18 2023-01-13 18:51:35 +01:00
Simone Taeggi
356c13e397 mock useIntl methods to solve issue with the unicode space character in the snapshot tests 2023-01-13 18:50:50 +01:00
Simone Taeggi
d1cb57f422 mock useintl 2023-01-13 17:18:33 +01:00
Bassel Kanso
cf2feee7ba
Merge branch 'main' into v4/generator-migration 2023-01-13 18:05:29 +02:00
Convly
1a3e275a9f Merge branch 'features/deits' into deits/diagnostics 2023-01-13 16:46:34 +01:00
Convly
c2ef0df8ee Merge branch 'main' into features/deits 2023-01-13 16:46:18 +01:00