yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-03 22:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 109 Branches 487 Tags
Commit Graph

5169 Commits

Author SHA1 Message Date
Simone Taeggi
908cc96965 Merge branch 'main' into enhancement/axios-migration-step-1-refactor 2023-01-16 12:07:06 +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
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
133fb98587
Merge branch 'main' into chore/add-browserlist 2023-01-16 09:07:44 +00:00
Simone Taeggi
32892c2a3e add a comment to highlight why we mocked react-intl 2023-01-16 09:46:43 +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
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
Josh
91f39fe978
Merge branch 'main' into chore/add-browserlist 2023-01-13 14:22:00 +00: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
Mark Kaylor
7e30022dc0 Use experimental json input release 2023-01-13 11:24:18 +01:00
Rémi de Juvigny
3a227b6f1e Add model name to entry events 2023-01-13 10:24:08 +01:00
Simone Taeggi
5ae7cf19e9 revert jest-styled-components-version 2023-01-13 10:18:29 +01:00
Ben Irvin
738ab7e4e3
Update packages/core/admin/server/register.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-01-13 10:06:35 +01:00
Ben Irvin
c2bd576407 configure env variables to disable/enable remote transfer route 2023-01-13 09:41:05 +01:00
Simone Taeggi
8c8e0391b2 update snapshots 2023-01-13 09:40:28 +01:00
Ben Irvin
a79f92e068 merge branch "main" 2023-01-13 09:13:00 +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
Rémi de Juvigny
a91a9016ad Add user ID to audit log modal 2023-01-12 18:21:53 +01: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
Jamie Howard
11ab76cc7a feat(content-manager): display min/max limits with field description 2023-01-12 15:13:35 +00:00
Simone
8690956c0a
Merge branch 'main' into enhancement/axios-migration-step-1-refactor 2023-01-12 14:30:36 +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
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
Simone Taeggi
20c19132cb clean up code, change baseURL and fix some typos 2023-01-11 15:06:08 +01:00
Mark Kaylor
71fcb0f89e Update component import 2023-01-11 14:13:31 +01:00
Julie Plantey
7ff704ad90 chore: fix snapshot 2023-01-11 14:06:37 +01:00
Josh
031640ea36
Merge pull request #15265 from strapi/fix/reorder-dz-and-repeatbles-relations 
Fixes https://github.com/strapi/strapi/issues/14908
 2023-01-11 12:52:01 +00:00
Julie Plantey
aa043810b5 Merge branch 'main' of https://github.com/strapi/strapi into features/authLogo 2023-01-11 13:49:26 +01:00
Mark Kaylor
8aa41242bf Add JSON component to modal 2023-01-11 13:20:32 +01:00
Jamie Howard
8677580c38 test(content-manager): utils/paths getInitialDataPathUsingTempKeys 2023-01-11 10:42:18 +00:00
Jamie Howard
5ef73b2e93 test(content-manager): update snapshot 2023-01-11 10:27:21 +00:00
Josh
985e1930a2
Update packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js 2023-01-11 10:15:20 +00:00
Josh
4d5f2fd152 fix: use browserlist for minification 2023-01-11 09:42:26 +00:00