yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 02:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,792 Commits 115 Branches 488 Tags
Commit Graph

22792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustav Hansen
d730154ff0
Merge branch 'features/ML-folder' into features/ML-folder-overview 2022-04-29 16:44:49 +02:00
Pierre Noël
b4cd89646b
Merge pull request #13083 from strapi/ML-folder/folder-tree 
Ml folder/folder tree
 2022-04-29 16:43:14 +02:00
Gustav Hansen
8a65d3ff39 chore: Update snapshot tests 2022-04-29 16:38:24 +02:00
Gustav Hansen
3ed60a1c6e AssetList: Remove stray console.log 2022-04-29 16:34:57 +02:00
Gustav Hansen
5ef6930239 useSelectionState: Update stories 2022-04-29 16:34:11 +02:00
Gustav Hansen
8cf98ef0c5 ML: Resolve faulty merge 2022-04-29 16:32:42 +02:00
Gustav Hansen
4474353079 ML: Unify variable name spellings 2022-04-29 16:02:00 +02:00
Pierre Noël
d1c3caf85c add bulk-delete route 2022-04-29 15:56:19 +02:00
Pierre Noël
f434d5c75a update test snapshots 2022-04-29 15:55:23 +02:00
Gustav Hansen
d86b7c58d1 AssetList/ FolderList: Add back placeholder divs 2022-04-29 15:20:47 +02:00
Gustav Hansen
fcb59d6f28 ML: Add level-up link to header layout if current location is not root 2022-04-29 15:15:42 +02:00
Alexandre BODIN
45158131e7
Merge pull request #13207 from strapi/security/upgradeNodemailerv4 
Upgrade nodemailer
 2022-04-29 14:52:14 +02:00
Gustav Hansen
bb6143dffc FolderCard: render folder actions 2022-04-29 14:45:50 +02:00
Gustav Hansen
ce49157ae1 useUpload: Pass down the current folder id 2022-04-29 14:04:21 +02:00
Bassel Kanso
3be406c8b4 compile config files when running cli commands that need the configs 2022-04-29 14:52:45 +03:00
Gustav Hansen
ed2a5ec748 FolderList: Update url filter 2022-04-29 13:41:12 +02:00
Gustav Hansen
a0bc6a3bbf ML: Hide folders during filter/ search 2022-04-29 12:24:44 +02:00
Gustav Hansen
a2e3da37bc FolderList: Fix full page reloads when navigating between folders 2022-04-29 12:14:18 +02:00
ronronscelestes
a03a57c9e9 left menu alt + logo input props comment 2022-04-29 11:36:21 +02:00
Alexandre Bodin
a9082d9a3b Merge branch 'master' into features/menu-logo v4.1.10-beta.0 2022-04-29 10:14:34 +02:00
Pierre Noël
cde92829c9 Merge branch 'features/ML-folder' into ML-folder/folder-tree 2022-04-29 10:13:42 +02:00
Mark Kaylor
a4d386a00a fix localizations request schema 2022-04-29 10:05:29 +02:00
Mark Kaylor
f82f331072 use function to check for find method 2022-04-29 09:04:24 +02:00
derrickmehaffy
f9123eebf6 Upgrade nodemailer 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-04-28 14:36:11 -07:00
Gustav Hansen
0581ea17fa EditAssetDialog: Render folder location 2022-04-28 17:59:37 +02:00
ronronscelestes
ac69ee8199
Merge pull request #13198 from strapi/menu-logo/tracking 
[Logo customization] trackUsage
 2022-04-28 17:50:02 +02:00
Gustav Hansen
a4fb1ef6b7 Merge branch 'features/ML-folder' into features/ML-folder-overview 2022-04-28 17:16:54 +02:00
Gustav Hansen
59fc895105 EditFolderDialog: Add ContextInfo in case a folder is edited 2022-04-28 16:54:27 +02:00
Gustav Hansen
214c6a906d EditFolderDialog: Start using SelectTree 2022-04-28 14:58:47 +02:00
Gustav Hansen
1baf0cfa91 Merge branch 'features/ML-folder' into features/ML-folder-create-folder 2022-04-28 14:36:08 +02:00
Gustav Hansen
ac16091628 ML: Mock deleteRequest for RemoveAssetDialog 2022-04-28 13:50:30 +02:00
Gustav Hansen
fb8f641096 ML: Use deleteRequest for useBulkRemoveAsset hook 2022-04-28 13:50:29 +02:00
Gustav Hansen
1529d17812 ML: Add tests for useRemoveAsset hook 2022-04-28 13:50:29 +02:00
Gustav Hansen
cc078b9f88 ML: Namespace useRemoveAsset hook 2022-04-28 13:50:29 +02:00
Gustav Hansen
19d498d199 ML: Replace removeAssetQuery with deleteRequest 2022-04-28 13:50:29 +02:00
Gustav Hansen
5e75ff9c16 ML: Add useRemoveFolder hook 2022-04-28 13:50:28 +02:00
Gustav Hansen
e382bc22c5 Chore: Update snapshot test 2022-04-28 13:50:28 +02:00
Gustav Hansen
7c1e90c89d SelectTree: Improve example 2022-04-28 13:50:28 +02:00
Gustav Hansen
d39b4c6ae7 SelectTree: Move custom Option props to selectProps 2022-04-28 13:50:28 +02:00
soupette
3647486db0 Change storybook port 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-28 13:50:27 +02:00
Gustav Hansen
3b5f26587a Add storybook documentation to develop local components outside the helper plugin 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-28 13:50:19 +02:00
Gustav Hansen
5048ed061c Chore: Fix snapshot test 2022-04-28 13:47:05 +02:00
Gustav Hansen
be68fe2957 Update test 2022-04-28 13:47:05 +02:00
Gustav Hansen
6eaf2d7441 ReactSelect: Improve styling for selected options 2022-04-28 13:47:04 +02:00
Gustav Hansen
18d26cc963 SelectTree: Handle react-select defaultValue 2022-04-28 13:47:04 +02:00
Gustav Hansen
71d06305b0 SelectTree: Reduce impact of disabled lint rule 2022-04-28 13:47:04 +02:00
Gustav Hansen
f9eb3004d4 SelectTree: Move Option into it's own component 2022-04-28 13:47:04 +02:00
Gustav Hansen
9b162d8e99 SelectTree: Improve PropTypes for options 2022-04-28 13:47:04 +02:00
Gustav Hansen
18e495f6e0 Link ML SelectTree to the helper-plugin storybook temporarily 2022-04-28 13:47:03 +02:00
Gustav Hansen
e31e8bc038 SelectTree: Update snapshot tests 2022-04-28 13:47:03 +02:00