yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 15:29:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,700 Commits 112 Branches 487 Tags
Commit Graph

2217 Commits

Author SHA1 Message Date
Convly
3aa905608f Update snapshots 2022-06-07 09:50:41 +02:00
Convly
7a99759c1e Merge branch 'releases/4.2.0' of github.com:strapi/strapi into features/typescript 2022-06-07 09:49:55 +02:00
ronronscelestes
27fe271dd3 improved tests coverage for MediaLibrary and BrowseStep 2022-06-03 17:33:57 +02:00
Gustav Hansen
49d7452219
Merge pull request #13424 from strapi/features/ML-folder-bulk-move-ui 
ML: Implement bulk-move UI
 2022-06-03 17:21:55 +02:00
Convly
a4c9488dce Update snapshots 2022-06-03 14:29:57 +02:00
Convly
c01d96252b Merge branch 'master' of github.com:strapi/strapi into features/typescript 2022-06-03 14:26:56 +02:00
Gustav Hansen
ec42375ee4 BulkMoveDialog: Simplify form submission 2022-06-03 09:33:04 +02:00
Gustav Hansen
b47e510918 BulkMoveButton: Remove legacy effect 2022-06-03 09:29:46 +02:00
Gustav Hansen
6fe8603e04 BulkMoveButton: Remove stray eslint ignore rule 2022-06-03 09:28:21 +02:00
DMehaffy
2ea34d2790
Fix CVE-2022-29256 
CVE Details: https://github.com/advisories/GHSA-gp95-ppv5-3jc5

Low sev as it requires your build env to be vuln but it's a quick fix.
 2022-06-02 11:29:21 -07:00
ronronscelestes
b3e3f4c999 variables for assetCount and folderCount in BrowseStep 2022-06-02 19:44:26 +02:00
ronronscelestes
76dcdb3239 added divider between FolderList/AssetList, fixed list UI for BrowseStep 2022-06-02 19:38:26 +02:00
Gustav Hansen
f97f7d7e8d
Merge pull request #13426 from strapi/ML-folder/folder-search 
[ML Folder] ML search folders
 2022-06-02 16:54:50 +02:00
Gustav Hansen
5bd5245e4e BulkMoveButton: Improve test description 2022-06-02 15:50:04 +02:00
ronronscelestes
f1ac87cb4a fix and improved MediaLibrary tests 2022-06-02 14:43:51 +02:00
Gustav Hansen
efae412816 BulkMoveButton: Improve tests 2022-06-02 14:36:45 +02:00
Gustav Hansen
822d8fbd78
Merge branch 'features/ML-folder' into features/ML-folder-bulk-move-ui 2022-06-02 14:20:05 +02:00
Gustav Hansen
e49ff9f4ef
Merge pull request #13431 from strapi/ML-folder/edit-asset-folder-structure 
[Ml folder] Fix edit asset
 2022-06-02 13:20:08 +02:00
ronronscelestes
75e2d7b3c7 Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/folder-search 2022-06-02 12:50:37 +02:00
ronronscelestes
81bf27b0b4 fix feedback loading translation 2022-06-02 12:42:13 +02:00
ronronscelestes
ce926543bf fixed test does not display folders if the current page !== 1 2022-06-02 12:33:49 +02:00
Gustav Hansen
9af873aa9d
Merge pull request #13379 from strapi/ML-folder/folder-card-refactor 
[ML Folder] FolderCard refactor
 2022-06-02 11:07:19 +02:00
ronronscelestes
3bb1230321 Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/folder-search 2022-06-02 08:59:25 +02:00
ronronscelestes
15f202c6bb fixed count translation and updated MediaLibrary/BrowseStep tests 2022-06-01 19:20:12 +02:00
Gustav Hansen
513bb21076 BulkMoveButton: Add tests 2022-06-01 15:01:46 +02:00
Gustav Hansen
e3f05dac7d BulkDeleteButton: Add tests 2022-06-01 14:44:42 +02:00
Gustav Hansen
bde377e700 BulkActions: add tests 2022-06-01 14:24:38 +02:00
Convly
85038468b7 Fix unit tests 2022-06-01 14:10:21 +02:00
ronronscelestes
d00dc9a278 fixed loading voiceover text 2022-06-01 11:59:25 +02:00
Gustav Hansen
fbf077c869 BulkMoveButton: Rename parent -> destination 2022-06-01 11:49:33 +02:00
ronronscelestes
49c77e69b6 updated FolderCard tests 2022-06-01 11:40:08 +02:00
ronronscelestes
249a64d3f7 fixing losing focus of folder when closing edit modal 2022-06-01 10:46:16 +02:00
Gustav Hansen
2ee9b538bd Merge branch 'features/ML-folder' into features/ML-folder-bulk-move-ui 2022-06-01 10:24:46 +02:00
Gustav Hansen
8a2c396282 ML: Fix bulk action "select all" 2022-06-01 10:18:59 +02:00
Gustav Hansen
fdf9ba5c74 BulkMoveDialog: add initial error handling 2022-05-31 22:09:07 +02:00
Gustav Hansen
0c6b48e534
Merge branch 'features/ML-folder' into features/ML-folder-bulk-move-ui 2022-05-31 21:38:12 +02:00
Gustav Hansen
50250589b6 ML: Add bulk move destination dialog 2022-05-31 21:36:25 +02:00
Gustav Hansen
88843f616e
Merge pull request #13412 from strapi/ML-folder/modal-header 
[ML Folder] Modal header
 2022-05-31 20:15:19 +02:00
ronronscelestes
15af3b041f updated/fixed tests 2022-05-31 19:59:07 +02:00
ronronscelestes
c2e8c83468 refacto FolderList usage in BrowseStep 2022-05-31 19:40:10 +02:00
ronronscelestes
248e657377 refacto FolderList, MediaLibrary use of FolderList 2022-05-31 19:28:42 +02:00
Pierre Noël
a9f53dc53b
Merge pull request #13350 from strapi/ML-folder/transactions 
Ml folder/transactions
 2022-05-31 18:58:22 +02:00
ronronscelestes
cba1adcea4 fixed css syntax 2022-05-31 17:14:37 +02:00
ronronscelestes
76def44903 fix css syntax 2022-05-31 17:13:45 +02:00
ronronscelestes
43c02a0572 Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/folder-card-refactor 2022-05-31 17:06:34 +02:00
ronronscelestes
3a50bdb934 added comment to explain the 80px 2022-05-31 16:38:44 +02:00
ronronscelestes
2aecd5e294 replaced px by rem for LoadingBody 2022-05-31 16:37:41 +02:00
ronronscelestes
aacc15d07f replaced 80px with rem for LoadingBody 2022-05-31 16:32:20 +02:00
ronronscelestes
6532903b42 fixed folderStructure needed in EditAssetDialog 2022-05-31 16:28:28 +02:00
Convly
da364912ee Merge branch 'master' of github.com:strapi/strapi into features/typescript 2022-05-31 15:29:18 +02:00