yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-28 19:34:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 114 Branches 486 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh
a8d403efda
Merge pull request #16250 from strapi/chore/update-lockfile 2023-03-30 08:26:41 +01:00
Jean-Sébastien Herbaux
0fec3131b9
Merge pull request #16189 from strapi/dependabot/npm_and_yarn/sift-16.0.1 2023-03-30 09:21:03 +02:00
Josh
c61c710de1 chore: update lockfile 2023-03-30 07:57:55 +01:00
Cooper Floyd
a9e2844cf7 update checksum in yarn.lock 2023-03-29 15:42:47 -05:00
Cooper Floyd
5a08232d04 upgrade sharp to 0.32.0 2023-03-29 14:58:10 -05:00
Jamie Howard
6ffd89d37d chore(ee) 2023-03-29 17:17:04 +01:00
Jamie Howard
9be3f27b61 test(ee): API test for moving entities to nearest available stage 2023-03-29 15:33:10 +01:00
Jamie Howard
a164176405 chore(ee) 2023-03-29 14:52:10 +01:00
Jamie Howard
d8da5b5214 fix(ee): logic for finding an entities target stage 2023-03-29 14:43:47 +01:00
Fernando Chavez
06889bafcb update marketplace's test snapshot 2023-03-29 15:35:23 +02:00
Jean-Sébastien Herbaux
b1dd88c41f
Merge branch 'main' into dependabot/npm_and_yarn/sift-16.0.1 2023-03-29 14:46:05 +02:00
Ben Irvin
a46577112f
Merge pull request #16238 from strapi/fix/allow-slash-in-data-transfer-url 2023-03-29 14:44:58 +02:00
dependabot[bot]
2a84397f7e
build(deps): bump sift from 16.0.0 to 16.0.1 
Bumps [sift](https://github.com/crcn/sift.js) from 16.0.0 to 16.0.1.
- [Release notes](https://github.com/crcn/sift.js/releases)
- [Changelog](https://github.com/crcn/sift.js/blob/master/changelog.md)
- [Commits](https://github.com/crcn/sift.js/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-29 12:39:36 +00:00
Convly
c46ba7d957 Merge branch 'releases/4.9.0' 2023-03-29 14:36:04 +02:00
Convly
ffe3f4621c v4.9.0 v4.9.0 2023-03-29 14:33:56 +02:00
Fernando Chávez
8ebe038379
Merge branch 'main' into feature/market-pagination 2023-03-29 14:22:47 +02:00
Fernando Chavez
10f601f08a fix lint issues on marketplace 2023-03-29 14:22:21 +02:00
Jamie Howard
f5279be28c test(ee): unit test for moving entities to previous stage 2023-03-29 12:57:16 +01:00
Jamie Howard
fa4d2fb7e1 feature(ee): when deleting a stage move entities to the previous stage 2023-03-29 12:33:16 +01:00
Ben Irvin
2e4387ed44 fix tests 2023-03-29 13:11:17 +02:00
Ben Irvin
06fd9bdeb2
Merge pull request #16180 from strapi/enh/allow-mysql2 2023-03-29 11:10:44 +02:00
Fernando Chávez
fe4e987b5a
Merge branch 'main' into feature/market-pagination 2023-03-29 11:05:19 +02:00
Fernando Chavez
578e41c1da Fix marketplace tests 2023-03-29 11:02:22 +02:00
Ben Irvin
524c5de8bd Merge branch 'main' into fix/allow-slash-in-data-transfer-url 2023-03-29 10:53:37 +02:00
Jean-Sébastien Herbaux
7c0354b9da
Merge pull request #16239 from strapi/enhancement/add-lao-locale 2023-03-29 10:53:08 +02:00
Convly
dc18b4c908 Change language name to Laotian 2023-03-29 10:48:59 +02:00
Josh
1519ef0e56
Merge pull request #16234 from strapi/fix/tempkeys-can-overlap-ids 2023-03-29 09:20:34 +01:00
Convly
f0aa8f9758 Update i18n snapshot 2023-03-29 09:43:14 +02:00
Ben Irvin
c59dd105f5 move trimTrailingSlash to remote providers 2023-03-29 09:41:39 +02:00
Convly
1abd0558cb Add Lao language to the list of supported ISO locales 2023-03-29 09:38:03 +02:00
Ben Irvin
84a8b1a419 move logic to provider utils 2023-03-29 09:30:49 +02:00
Ben Irvin
9bea9793ad
Merge branch 'main' into fix/allow-slash-in-data-transfer-url 2023-03-29 08:58:42 +02:00
Ben Irvin
7fbad9fb9d strip a single trailing slash from admin url 2023-03-29 08:53:06 +02:00
Paul
65c74458f0
Added new lines from EN 
Localization has caught up with the current version of the en.json file
 2023-03-29 00:25:32 +03:00
Paul
670d860434
Sort lines A->z 2023-03-29 00:23:36 +03:00
Josh
182305d2d3 fix: use the ids & tempkeys not the array length 
chore: fix InformationBoxEE test
 2023-03-28 18:27:49 +01:00
Jean-Sébastien Herbaux
31223c9545
Merge pull request #16006 from strapi/features/data-transfer 2023-03-28 18:44:55 +02:00
Convly
9598beeb30 Fix unit test (outdated push url) 2023-03-28 18:25:27 +02:00
Ben Irvin
49d32d001b
Merge branch 'main' into features/data-transfer 2023-03-28 17:47:21 +02:00
Josh
8597019f87
Merge pull request #16225 from strapi/fix/webpack-main-fields 2023-03-28 16:45:45 +01:00
Rémi de Juvigny
30d5949dcd Fix marketplace data fetching 2023-03-28 17:07:52 +02:00
Rémi de Juvigny
570daa430b Use pxToRem 2023-03-28 17:07:37 +02:00
Rémi de Juvigny
9fb150a7f3 Move useDebounce to the admin hooks 2023-03-28 17:07:37 +02:00
Rémi de Juvigny
8babbcb31d first mark feedback 2023-03-28 17:07:37 +02:00
Rémi de Juvigny
ee7520bfa0 Fix marketplace tests 2023-03-28 17:07:36 +02:00
Rémi de Juvigny
2179f68eb3 Refactor marketplace to add API search 2023-03-28 17:07:06 +02:00
Rémi de Juvigny
4d7bb545bb Use testid more in markatplace tests 2023-03-28 17:06:09 +02:00
Rémi de Juvigny
2221d7e93f Remove marketplace tab snapshots 2023-03-28 17:05:17 +02:00
Rémi de Juvigny
82f31beeb0 Speed up providers tests 2023-03-28 17:04:51 +02:00
Rémi de Juvigny
f53edfdb1b Faster waitForReload 2023-03-28 17:04:19 +02:00