yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-23 17:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,467 Commits 114 Branches 485 Tags
Commit Graph

1346 Commits

Author SHA1 Message Date
Gustav Hansen
fafdaa4e11
Merge pull request #14359 from GitStartHQ/STRAP-63 
ML: Empty state is shown after deleting all assets from a page
 2022-12-06 13:29:07 +01:00
Gustav Hansen
acada6047e
Merge pull request #15090 from strapi/dependabot/npm_and_yarn/jest-styled-components-7.1.1 
chore(deps-dev): bump jest-styled-components from 7.0.2 to 7.1.1
 2022-12-06 13:10:01 +01:00
Gustav Hansen
4cf4638a01
Merge pull request #15092 from strapi/fix/upload-crop-folders 
Preserve folder id when cropping images
 2022-12-06 12:56:59 +01:00
Gustav Hansen
67ad079472 Chore: Update snapshot tests 2022-12-06 12:35:31 +01:00
Gustav Hansen
851425e82b
Merge pull request #14988 from strapi/dependabot/npm_and_yarn/react-router-dom-5.3.4 
chore(deps): bump react-router-dom from 5.2.0 to 5.3.4
 2022-12-06 12:31:38 +01:00
Gustav Hansen
eabf3ebc0e EditAssetDialog: Create cropped image in the same folder as the original 2022-12-06 12:13:32 +01:00
Gustav Hansen
a19579634c useEditAsset: Send folder.id instead of full folder object 2022-12-06 12:12:58 +01:00
Josh
ac978ad6ed
Merge branch 'main' into dependabot/npm_and_yarn/msw-0.49.1 2022-12-05 11:20:48 +00:00
gitstart
c1faa543ef chore: updates implementation logic 2022-12-05 05:17:58 +00:00
gitstart
37440bb814 Merge commit 'e3c273cf36d7d12547fcc4bea1778df513aedb46' of https://github.com/GitStartHQ/strapi into STRAP-63 2022-12-05 05:17:54 +00:00
Convly
5453885f7a v4.5.3 2022-11-30 16:27:25 +01:00
dependabot[bot]
d8a02ca9b8
chore(deps): bump msw from 0.42.3 to 0.49.1 
Bumps [msw](https://github.com/mswjs/msw) from 0.42.3 to 0.49.1.
- [Release notes](https://github.com/mswjs/msw/releases)
- [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mswjs/msw/compare/v0.42.3...v0.49.1)

---
updated-dependencies:
- dependency-name: msw
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-30 14:53:50 +00:00
dependabot[bot]
e49ee71ce2
chore(deps): bump react-router-dom from 5.2.0 to 5.3.4 
Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 5.2.0 to 5.3.4.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/v5.3.4/packages/react-router-dom)

---
updated-dependencies:
- dependency-name: react-router-dom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-30 10:45:09 +00:00
Simone
a39b999359
Merge branch 'main' into chore/ds-140 2022-11-30 09:10:23 +01:00
Simone Taeggi
3e7d720046 upgrade ds version and tests 2022-11-28 18:02:23 +01:00
Pierre Noël
78b8319070 remove unecessary checks in tests breaking with mysql 5 2022-11-28 10:45:30 +01:00
Nathan Pichon
4e6a8bf672
Merge branch 'main' into fix/file-upload-components 2022-11-23 15:00:44 +01:00
Josh
a73dc6fe78
Merge pull request #14849 from strapi/fix/card-badge 2022-11-22 17:18:53 +00:00
Alexandre Bodin
bcb1b7f472 v4.5.2 2022-11-22 17:54:52 +01:00
Julie Plantey
a6c2f79bbc
Merge pull request #14922 from 5idereal/patch-1 
update Traditional Chinese translation
 2022-11-22 16:03:02 +01:00
Josh
2dbeca22b7 chore: update snapshots 2022-11-22 13:40:24 +00:00
Josh
9ed9a59202 fix: define a default border color 2022-11-22 13:28:29 +00:00
Julie Plantey
e664fa94d0 fix conflicts with main branch 2022-11-22 12:01:46 +01:00
Josh
0da42fea47 fix: icon size and alignment 2022-11-21 11:53:10 +00:00
Josh
5169732007 Merge branch 'main' into fix/card-badge 2022-11-21 11:27:15 +00:00
Nathan Pichon
d69430584f
Merge branch 'main' into fix/file-upload-components 2022-11-21 09:47:16 +01:00
Pierre Noël
f4ed17809a
Merge pull request #14909 from strapi/fix/schema-support-postgres 
Fix schema support for postgres when using raw queries
 2022-11-19 11:51:19 +01:00
Josh
4ad46e481f Revert "chore: replace imports" 
This reverts commit 1c8b34c3fa7002c0e44d3c583c844367e006f631.
 2022-11-18 10:01:22 +00:00
Josh
1c8b34c3fa chore: replace imports 2022-11-18 08:56:10 +00:00
Nathan Pichon
ac6198b519
Merge branch 'main' into fix/file-upload-components 2022-11-18 09:40:01 +01:00
5idereal
3919e13274
update Traditional Chinese translation 2022-11-18 12:47:34 +08:00
Josh
37f523b78d chore: update snapshots 2022-11-17 17:25:14 +00:00
Pierre Noël
82b2cd4805 fix unit tests 2022-11-17 12:01:09 +01:00
Pierre Noël
9ff4f19660 fix schema support for postgres when using raw queries 2022-11-17 10:08:49 +01:00
Gustav Hansen
1210f8406c
Merge pull request #14903 from strapi/chore/asset-card-tests 
Chore: Fix AssetCardBase tests
 2022-11-17 09:36:55 +01:00
Gustav Hansen
ea9d957a29 Chore: Fix AssetCardBase tests 2022-11-16 20:02:26 +01:00
Convly
8c20ea2b5c v4.5.1 2022-11-16 18:00:30 +01:00
nathan-pichon
3c1de7565e
test(upload): add test on file inside components 2022-11-16 16:10:11 +01:00
Gustav Hansen
9ffd38f6c9 Chore: Update tests for @testing-library/user-event API changes 2022-11-15 15:01:19 +01:00
Gustav Hansen
ea0ab221c3 Chore: Update @testing-library/user-event to 14.4.3 2022-11-15 13:00:49 +01:00
Gustav Hansen
5f24350a48
Merge branch 'main' into chore/update-testing-library-react 2022-11-15 11:54:47 +01:00
Gustav Hansen
db6f0cd2b7
Merge pull request #14866 from strapi/chore/update-ds 
chore: update design-system to 1.2.8
 2022-11-15 11:53:43 +01:00
Gustav Hansen
65597622c6 Chore: Update @testing-library/react to 12.1.4 2022-11-15 11:15:30 +01:00
Gustav Hansen
6790ed2940
Merge pull request #14860 from strapi/chore/update-testing-hooks 
Chore: Update @testing-library/react-hooks to 8.0.1
 2022-11-15 11:12:33 +01:00
Josh
f0e94fde66 chore: update design-system to 1.2.8 2022-11-15 09:01:04 +00:00
Gustav Hansen
ee75ce9e32 Chore: Update @testing-library/react-hooks to 8.0.1 2022-11-14 18:39:19 +01:00
Gustav Hansen
03d815ea17 Chore: Update @testing-library/dom to 8.19.0 2022-11-14 18:38:56 +01:00
Gustav Hansen
cebbe1d199 chore: Update snapshot tests 2022-11-14 13:31:49 +01:00
Gustav Hansen
280edc92f2 UploadProgress: Update colors and fix alignments 2022-11-14 13:05:46 +01:00
Gustav Hansen
fcf1504f6f UploadProgress: Remove border-radius bottom-left and bottom-right 2022-11-14 12:47:56 +01:00