yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-17 19:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,742 Commits 109 Branches 504 Tags
Commit Graph

21742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustav Hansen
d1c5804d54 ReactSelect: Improve size of dropdown indicator 2022-06-08 13:59:37 +01:00
Gustav Hansen
b0debcd320 SelectTree: truncate long folder names 2022-06-08 13:26:04 +01:00
Gustav Hansen
66a44454f3
Merge pull request #13502 from strapi/features/ML-folder-browse-filter-empty 
BrowseStep: Always display filter toolbar (regardless of asset/ folder count)
 2022-06-08 12:19:29 +01:00
Gustav Hansen
1e8f5a4f47
Merge pull request #13500 from strapi/features/ML-folder-update-master 
ML: Update to latest master branch
 2022-06-08 11:57:08 +01:00
Gustav Hansen
ee8ff572f7 BrowseStep: Display filter regardless of asset or foldercount when filtering 2022-06-08 11:22:31 +01:00
Gustav Hansen
09fd54de7a Merge branch 'master' into features/ML-folder-update-master 2022-06-08 10:44:47 +01:00
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
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
3b08de5765
Merge pull request #13489 from strapi/features/ML-folder-edit-asset 
EditAssetDialog: Fix changing folder location
 2022-06-07 16:03:45 +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
28814db08e
Merge pull request #13485 from strapi/features/ML-folder-bulk-move-error 
BulkMoveButton: Move validation into BulkMoveDialog
 2022-06-07 14:05:57 +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
Gustav Hansen
86e57e17f4
Merge pull request #13484 from strapi/dependabot/npm_and_yarn/qs-6.10.5 
Bump qs from 6.10.3 to 6.10.5
 2022-06-07 11:13:44 +01:00
Gustav Hansen
39f67d1d41 BulkMoveButton: Move validation into BulkMoveDialog 2022-06-07 10:39:04 +01:00
dependabot[bot]
f35de37649
Bump qs from 6.10.3 to 6.10.5 
Bumps [qs](https://github.com/ljharb/qs) from 6.10.3 to 6.10.5.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.3...v6.10.5)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-07 09:08:25 +00: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
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
Julie Plantey
164ca83ac6
Merge pull request #13418 from ductnn/patch-1 
Update vi.json
 2022-06-03 16:45:29 +02:00
Julie Plantey
116a311b44
Merge pull request #13437 from 100krot/pl-translation 
Pl translation
 2022-06-03 16:44:59 +02:00
Alexandre BODIN
43ac9e1430
Merge pull request #13450 from strapi/fix/CVE-2021-46708 
Fix CVE-2021-46708
 2022-06-03 10:03:02 +02:00
Alexandre BODIN
0d8254e460
Merge pull request #13449 from strapi/fix/cve-2022-29256 
Fix CVE-2022-29256
 2022-06-03 10:02:03 +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
0309b36671
Fix CVE-2021-46708 2022-06-02 11:54:01 -07: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