yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 23:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 111 Branches 487 Tags
Commit Graph

1896 Commits

Author SHA1 Message Date
Gustav Hansen
049661fe98
Merge pull request #13497 from strapi/features/ML-folder-mime-filter 
ML: Skip loading folders, if an asset-only filter is applied
 2022-06-08 10:34:39 +01:00
Gustav Hansen
8527bf533a
Merge pull request #13492 from strapi/features/ML-folder-richtext-media-dialog 
MediaLibraryDialog: Fix displayed location after changes
 2022-06-08 09:52:02 +01:00
Gustav Hansen
81c8f0889d ML/ AssetDialog: Add integration tests for mime-type filter 2022-06-08 09:40:55 +01:00
Gustav Hansen
bbf1419b67
Merge pull request #13493 from strapi/ML-folder/fix-edit-folder 
[ML Folder] fixes EditFolderDialog
 2022-06-08 08:59:53 +01:00
Gustav Hansen
71e79b351a AssetDialog: Mirror ML permission, pagination and filter behaviour 2022-06-08 08:48:49 +01:00
Gustav Hansen
bd6813aab7 containsAssetFilter: Rename method and add tests 2022-06-08 08:42:53 +01:00
ronronscelestes
97c97cd968 added test for edit error 2022-06-07 20:13:40 +02:00
ronronscelestes
a6a42f463c fixed form layout 2022-06-07 19:45:22 +02:00
ronronscelestes
cc76f01140 fixed edit folder move error message and style 2022-06-07 19:09:45 +02:00
Gustav Hansen
7501348524
Merge pull request #13490 from strapi/features/ML-folder-filters 
ML: Fix assets + folder filters
 2022-06-07 16:57:54 +01:00
Gustav Hansen
f7a5b866ea ML: Skip loading folders if an asset only filter is applied 2022-06-07 16:56:01 +01:00
ronronscelestes
0745dad06f fixed name value undefined when creating folder 2022-06-07 17:52:13 +02:00
ronronscelestes
964106d44a fixed focusing on edit folder button when leaving create folder 2022-06-07 17:34:07 +02:00
Gustav Hansen
873fcf879c MediaLibraryDialog: Fix displayed location after changes 2022-06-07 16:31:57 +01:00
Gustav Hansen
d613d6aa83
Merge pull request #13487 from strapi/features/ML-folder-card-height 
AssetList: Make all items equally height
 2022-06-07 16:04:47 +01:00
Gustav Hansen
8dc5c8a90c useAssets/ useFolders: Add query merge tests 2022-06-07 15:42:29 +01:00
Gustav Hansen
b34cc3cb5d ML: Fix assets + folder filters 2022-06-07 14:57:30 +01:00
Gustav Hansen
dc72d3c7e2 chore: Update snapshot tests 2022-06-07 14:48:15 +01:00
Gustav Hansen
4ea824d9ca AssetList: Make all items equally height 2022-06-07 14:46:36 +01:00
Gustav Hansen
05cb8e8da1 EditAssetDialog: Fix changing folder location 2022-06-07 14:29:44 +01:00
Gustav Hansen
c6d7bef561
Merge pull request #13486 from strapi/features/ML-folder-prop-types 
ML: Fix various prop-types errors
 2022-06-07 14:06:10 +01:00
Gustav Hansen
813aca387c EditAssetDialog: Fix empty field value 2022-06-07 12:43:50 +01:00
Gustav Hansen
7ea93622fd ML: Relax prop-types for UploadingAssetCard and PendingAssetStep 2022-06-07 12:21:46 +01:00
Gustav Hansen
1e9c66a351 SelectTree: Improve Option prop-types 2022-06-07 12:19:17 +01:00
Gustav Hansen
275c896052 SelectTree: Fix .oneOfType() prop-type check 2022-06-07 12:02:32 +01:00
Gustav Hansen
1e284eb6cf ML: Fix various prop-types errors 2022-06-07 11:55:52 +01:00
Alexandre Bodin
c12bde7e87 Merge branch 'master' into releases/4.2.0 2022-06-07 12:15:44 +02:00
Gustav Hansen
39f67d1d41 BulkMoveButton: Move validation into BulkMoveDialog 2022-06-07 10:39:04 +01:00
Gustav Hansen
ed07e75bf3
Merge pull request #13448 from strapi/ML-folder/lists-layouts 
[ML Folder] Lists layouts fixes
 2022-06-07 09:37:27 +01:00
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