yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 17:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,990 Commits 115 Branches 488 Tags
Commit Graph

1136 Commits

Author SHA1 Message Date
Bassel Kanso
52c0a74418 Merge branch 'master' into features/api-token-v2 2022-08-05 09:55:17 +03:00
Gustav Hansen
d73b847c5c
Merge pull request #13978 from strapi/fix/ml-permissions-view 
ML: Improve canRead and canCreate permission messages
 2022-08-04 17:41:42 +02:00
Gustav Hansen
838dcc5a01 EmptyOrNoPermissions: simplify getContent() 2022-08-04 15:36:15 +02:00
Gustav Hansen
3c6a58aaea ML: Remove default NoPermissions component 2022-08-04 15:17:56 +02:00
Gustav Hansen
11d021507c ML: Improve canRead and canCreate permission messages 2022-08-04 14:00:23 +02:00
Bassel Kanso
94b1ae4c70 Merge branch 'master' into features/api-token-v2 2022-08-04 14:11:28 +03:00
Gustav Hansen
71f290f4c1 Upload: Handle file upload errors gracefully 2022-08-04 12:06:17 +02:00
Marc
e73aaf6e9e
Merge pull request #13930 from strapi/fix/manually-resize-image-on-upload 
Do not override width and height after uploading image
 2022-08-03 11:51:58 +02:00
Marc-Roig
237d12abf4 typos 2022-08-03 09:39:52 +02:00
Gustav Hansen
f25f1b45b7
Merge branch 'master' into chore/bump-ds-1-2-1-beta-0 2022-08-02 13:20:54 +02:00
Alexandre Bodin
7039c0d228 v4.3.2 2022-08-01 17:18:09 +02:00
Pierre Noël
1eab2fb08c v4.3.1 2022-08-01 16:44:44 +02:00
Marc-Roig
09fdd984c1 test upload image 2022-08-01 15:53:03 +02:00
Gustav Hansen
d9a7e21abe chore: Update snapshot tests 2022-08-01 15:28:01 +02:00
Marc-Roig
f0b67b9ec5 add function for uploading image 2022-08-01 12:14:13 +02:00
Marc
47a4486943 do not override width and height 2022-07-30 10:14:37 +02:00
Gustav Hansen
b511597ea2
Merge pull request #13902 from strapi/fix/ml-assetdialog-canread 
AssetDialog: Properly take canRead permissions into account
 2022-07-29 16:40:49 +02:00
Gustav Hansen
7a8a3fd257 AssetDialog: Properly take canRead permissions into account 2022-07-29 14:28:59 +02:00
Gustav Hansen
d67128ed9f ML: Hide bulk actions if not assets or folders exist 2022-07-29 12:34:25 +02:00
Pierre Noël
1f7e485278 add e2e to bulk-delete only files and only folders 2022-07-27 18:02:47 +02:00
Pierre Noël
faa4fbaaff Fix the bulk delete in the ML when no folders are selected 2022-07-27 17:52:33 +02:00
Convly
74a2b908df v4.3.0 2022-07-27 14:44:39 +02:00
Gustav Hansen
887e7b8f7c ML: Add useTracking mocks in tests 2022-07-27 14:11:22 +02:00
Gustav Hansen
39eb8abeea chore: Downgrade react-intl back to 5.20.2 2022-07-27 13:58:15 +02:00
Gustav Hansen
d886f503ca Jest: add closeTo() utility temporarily 2022-07-27 13:14:49 +02:00
Gustav Hansen
5ca0538651 Upload: Make metrics tests compatible with jest@26 2022-07-27 12:34:27 +02:00
Convly
2d6afbf044 Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 10:32:43 +02:00
Convly
a4c2f3b46a Merge branch 'master' into releases/4.3.0 2022-07-27 09:44:31 +02:00
Pierre Noël
8c426965cc
Merge pull request #13721 from strapi/ML-folder/telemetry-back 
Add backend telemetry events in ML
 2022-07-26 10:53:39 +02:00
Pierre Noël
a5664af2df revert date-fns to 2.28.0 2022-07-25 16:01:54 +02:00
Pierre Noël
3d231fb376 use date-fns + rename variables 2022-07-25 14:28:59 +02:00
dependabot[bot]
0500fc4a25
Bump immer from 9.0.6 to 9.0.15 
Bumps [immer](https://github.com/immerjs/immer) from 9.0.6 to 9.0.15.
- [Release notes](https://github.com/immerjs/immer/releases)
- [Commits](https://github.com/immerjs/immer/compare/v9.0.6...v9.0.15)

---
updated-dependencies:
- dependency-name: immer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-25 09:46:09 +00:00
Pierre Noël
3741876099 change cron logic for metrics 2022-07-25 11:08:39 +02:00
Convly
0b8c7b59c6 Merge branch 'master' into features/typescript 2022-07-25 09:30:18 +02:00
Pierre Noël
bac1080f13 refactor strapi.cron 2022-07-22 17:28:51 +02:00
Gustav Hansen
01784575bf Merge branch 'master' into features/ML-folder 2022-07-22 12:48:41 +02:00
Gustav Hansen
ed90965cc1 chore: Update react-intl to 6.x 2022-07-22 12:45:36 +02:00
dependabot[bot]
e11f7b53f4
Bump react-intl from 5.20.2 to 5.25.1 
Bumps [react-intl](https://github.com/formatjs/formatjs) from 5.20.2 to 5.25.1.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@5.20.2...react-intl@5.25.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-22 09:05:23 +00:00
Julie Plantey
e7cd4a9443
Merge pull request #13776 from yangfei4913438/translate 
add several items in zh-Hans and fixed some other minor bugs.
 2022-07-20 08:45:23 +02:00
杨飞
9a59921d3e add several items in zh-Hans and fixed some other minor bugs. 2022-07-19 00:36:36 +08:00
Pierre Noël
b78af34ebf fix unit test 2022-07-18 12:05:32 +02:00
Gustav Hansen
eef4ddf77b
Merge pull request #13768 from strapi/fix/ml-upload-error-msg 
ML: Display proper error message thrown by the API
 2022-07-18 12:02:42 +02:00
Gustav Hansen
267c7d079d
Merge pull request #13706 from strapi/fix/ml-cropping 
PreviewBox: Fix image cropping
 2022-07-18 11:49:26 +02:00
Gustav Hansen
7f84c4ed8a PreviewBox: Simplify conditional 2022-07-14 12:01:36 +02:00
Gustav Hansen
f94df6ff12 PreviewBox: Fix cropping flow for local assets 2022-07-14 11:58:19 +02:00
Gustav Hansen
081f4aabda Upload: Fix typo in upload middleware 2022-07-13 22:19:19 +02:00
Gustav Hansen
bd3e82c368 ML: Display proper error message thrown by the API 2022-07-13 18:14:01 +02:00
Alexandre Bodin
fe296baf71 v4.2.3 2022-07-13 14:20:58 +02:00
Pierre Noël
53d2a3d17d revert jest update + use and refactor strapi.cron 2022-07-13 13:35:32 +02:00
Pierre Noël
bbceef7fbe add unit test + update jest 2022-07-13 13:32:52 +02:00