yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-17 02:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,413 Commits 110 Branches 504 Tags
Commit Graph

7295 Commits

Author SHA1 Message Date
Simone Taeggi
011d1ea1ed add the link to contributor doc in the helper plugin readme 2023-01-16 12:05:33 +01: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
Julie Plantey
6960c988be Merge branch 'main' of https://github.com/strapi/strapi into features/authLogo 2023-01-16 10:30:23 +01: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
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
FabienGreard
da11558253 fix(VideoAssetCard): dissalow pointer-events on videoPreview 2023-01-14 15:25:59 +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
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
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
Josh
07c9b3b54f fix: add browserslist-to-esbuild to devDeps for helper-plugin 2023-01-13 11:19:12 +00:00
Marc-Roig
dd98293a55 better filtering in inverse order column 2023-01-13 10:53:30 +01:00
Simone Taeggi
5ae7cf19e9 revert jest-styled-components-version 2023-01-13 10:18:29 +01:00
Simone Taeggi
8c8e0391b2 update snapshots 2023-01-13 09:40:28 +01:00
Josh
9ec14bc8c8 chore: revert strict additon 
it doesn't work as anticipated at the moment
 2023-01-12 17:30:47 +00:00
Julie Plantey
8f542f4be5 bump DS to 1.4.2 2023-01-12 17:17:57 +01:00
Simone Taeggi
169e427d77 revert snapshot 2023-01-12 16:59:00 +01:00
Julie Plantey
4e52ca13a3 feedback fixes: conditional logo, refactor Stack, canSubmit, test naming 2023-01-12 16:37:18 +01:00
Simone Taeggi
96ca883835 test update snapshot 2023-01-12 16:31:31 +01:00
Simone
8690956c0a
Merge branch 'main' into enhancement/axios-migration-step-1-refactor 2023-01-12 14:30:36 +01:00
Simone Taeggi
0bd096d5b9 Merge branch 'enhancement/axios-migration-step-1-refactor' of github.com:strapi/strapi into enhancement/axios-migration-step-1-refactor 2023-01-12 14:30:07 +01:00
Simone Taeggi
32c76feb73 remove useless baseURL definition in axios create 2023-01-12 14:29:53 +01:00
dependabot[bot]
01166e7c83
chore(deps): bump @fingerprintjs/fingerprintjs from 3.3.3 to 3.3.6 
Bumps [@fingerprintjs/fingerprintjs](https://github.com/fingerprintjs/fingerprintjs) from 3.3.3 to 3.3.6.
- [Release notes](https://github.com/fingerprintjs/fingerprintjs/releases)
- [Commits](https://github.com/fingerprintjs/fingerprintjs/compare/v3.3.3...v3.3.6)

---
updated-dependencies:
- dependency-name: "@fingerprintjs/fingerprintjs"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-12 12:19:22 +00:00
Gustav Hansen
8282fc1900 Chore: Update axios to 1.2.2 2023-01-12 13:03:53 +01:00
Simone
42c554182f
Merge branch 'main' into enhancement/axios-migration-step-1-refactor 2023-01-12 09:17:33 +01:00
Josh
6d3f6dcd1b chore: use strict false for relations 2023-01-11 17:22:20 +00:00
dependabot[bot]
b7b19c8658
chore(deps): bump @pmmmwh/react-refresh-webpack-plugin 
Bumps [@pmmmwh/react-refresh-webpack-plugin](https://github.com/pmmmwh/react-refresh-webpack-plugin) from 0.5.7 to 0.5.10.
- [Release notes](https://github.com/pmmmwh/react-refresh-webpack-plugin/releases)
- [Changelog](https://github.com/pmmmwh/react-refresh-webpack-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pmmmwh/react-refresh-webpack-plugin/compare/v0.5.7...v0.5.10)

---
updated-dependencies:
- dependency-name: "@pmmmwh/react-refresh-webpack-plugin"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-11 16:56:58 +00:00
Convly
d36609ff26 v4.5.6 2023-01-11 17:48:52 +01:00
Marc
312cc2b4d4
Merge pull request #15158 from strapi/relations-reordering/non-strict-connect 2023-01-11 17:48:06 +01:00
Simone Taeggi
feff8cd9f8 Merge branch 'main' into enhancement/axios-migration-step-1-refactor 2023-01-11 17:16:59 +01:00
Jean-Sébastien Herbaux
6750fbc8d7
Merge pull request #15011 from drubetti/fix/factories-types 2023-01-11 17:15:58 +01:00
Marc-Roig
cf01fb8db6 make strict connect explicit when inserting relation 2023-01-11 16:40:06 +01:00
Marc-Roig
51cd3ddc85 rename arr to computedRelations 2023-01-11 16:36:36 +01:00
Simone
1ac64d931e
Merge branch 'main' into enhancement/axios-migration-step-1-refactor 2023-01-11 15:54:33 +01:00
Julie Plantey
c335d3d1ee fix: post request content type + axiosInstance headers 2023-01-11 15:10:20 +01:00