29765 Commits

Author SHA1 Message Date
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
Convly
4c4fd652b9 Merge branch 'features/deits' of github.com:strapi/strapi into deits/diagnostics 2023-01-13 16:45:51 +01:00
Convly
ec41c1ce38 Init diagnostics 2023-01-13 16:43:20 +01:00
Julie Plantey
cffb932413 chore: update snapshots 2023-01-13 16:24:06 +01:00
Julie Plantey
e1c3fedfa8 Merge branch 'main' of https://github.com/strapi/strapi into features/authLogo 2023-01-13 16:20:19 +01:00
Julie Plantey
67c35bcb7d disabled fetching when cannot read + change Form component name to CustomizationInfos 2023-01-13 16:20:13 +01:00
markkaylor
a0f0b2d2be
Merge pull request #15411 from strapi/audit-logs/modal-json-compo
[audit logs] Add JSON component to modal
2023-01-13 15:37:21 +01:00
Marc-Roig
25e1435173 Revert "remove relations populate configuration"
This reverts commit cea950fd9657df6434d22ecd29c1bbfd8d9a0912.
2023-01-13 15:35:21 +01:00
Josh
91f39fe978
Merge branch 'main' into chore/add-browserlist 2023-01-13 14:22:00 +00:00
Marc-Roig
319c7473f3 test components order is preserved 2023-01-13 15:20:46 +01:00
Simone Taeggi
5bc130df4d fix node 18.13 problem with unicode space 2023-01-13 15:11:12 +01:00
Rémi de Juvigny
a56b2812a0
Merge pull request #15429 from strapi/audit-logs/log-details
[Audit logs] Enhance audit log details
2023-01-13 14:52:12 +01:00
Jamie Howard
1eec59973a feat(content-manager): cover all field types
feat(content-manager): construct min/max description separately from main description
2023-01-13 13:36:56 +00:00
markkaylor
5e1fda7e13
Merge pull request #15442 from strapi/fix/ds-link-doc
Fix incorrect location for command
2023-01-13 14:25:16 +01:00
Josh
07c9b3b54f fix: add browserslist-to-esbuild to devDeps for helper-plugin 2023-01-13 11:19:12 +00:00
markkaylor
89f7fe4999
Fix incorrect location for command 2023-01-13 11:33:51 +01:00
Bassel
faf4d728cd Merge branch 'main' into chore/transactions 2023-01-13 12:26:20 +02:00
Mark Kaylor
7e30022dc0 Use experimental json input release 2023-01-13 11:24:18 +01:00
Bassel
12dd68f4a7 Improve transaction API:
- make it possible to have nested transactions
- wrap the knex transaction api and apply changes everywhere it was used
2023-01-13 12:23:30 +02:00
Marc-Roig
dd98293a55 better filtering in inverse order column 2023-01-13 10:53:30 +01:00
Josh
3ca0a71ae8 chore: make sure we still export the UMD version to avoid breaking changes 2023-01-13 09:39:49 +00:00
Josh
80c0ec95d5 chore: tidy up deps and export cjs & esm modules 2023-01-13 09:31:56 +00:00
Ben Irvin
a4d0b0d6a3
Merge pull request #15423 from strapi/deits/cli-force-yes 2023-01-13 10:25:56 +01:00
Ben Irvin
ecec7a3481
Merge pull request #15406 from strapi/deits/transfer-protocols 2023-01-13 10:25:36 +01:00
Rémi de Juvigny
3a227b6f1e Add model name to entry events 2023-01-13 10:24:08 +01:00