yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-04 19:13:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,306 Commits 145 Branches 512 Tags
Commit Graph

884 Commits

Author SHA1 Message Date
Convly
0b8c7b59c6 Merge branch 'master' into features/typescript 2022-07-25 09:30:18 +02:00
Gustav Hansen
01784575bf Merge branch 'master' into features/ML-folder 2022-07-22 12:48:41 +02:00
Julie Plantey
e7cd4a9443
Merge pull request #13776 from yangfei4913438/translate 
add several items in zh-Hans and fixed some other minor bugs.
 2022-07-20 08:45:23 +02:00
杨飞
9a59921d3e add several items in zh-Hans and fixed some other minor bugs. 2022-07-19 00:36:36 +08:00
Gustav Hansen
eef4ddf77b
Merge pull request #13768 from strapi/fix/ml-upload-error-msg 
ML: Display proper error message thrown by the API
 2022-07-18 12:02:42 +02:00
Gustav Hansen
267c7d079d
Merge pull request #13706 from strapi/fix/ml-cropping 
PreviewBox: Fix image cropping
 2022-07-18 11:49:26 +02:00
Gustav Hansen
7f84c4ed8a PreviewBox: Simplify conditional 2022-07-14 12:01:36 +02:00
Gustav Hansen
f94df6ff12 PreviewBox: Fix cropping flow for local assets 2022-07-14 11:58:19 +02:00
Gustav Hansen
bd3e82c368 ML: Display proper error message thrown by the API 2022-07-13 18:14:01 +02:00
Pierre Noël
c7e522ef1f Merge branch 'master' into features/ML-folder 2022-07-13 13:28:28 +02:00
Convly
a5fbcc9e48 Merge branch 'master' into features/typescript 2022-07-07 15:20:34 +02:00
Julie Plantey
034e03fe0d
Merge pull request #13681 from strapi/ML-folder/track-events-front 
[ML Folder] Track events front
 2022-07-06 18:05:29 +02:00
ronronscelestes
6ff62ac705 feedback assetsCountByType 2022-07-06 16:03:55 +02:00
Gustav Hansen
aebb80e4b0
Merge pull request #13700 from strapi/fix/dnd-ml-from-computer 
FromComputerForm: Fix drag & drop events
 2022-07-06 12:13:04 +02:00
Gustav Hansen
493604d47d FromComputerForm: Fix drag & drop events 2022-07-06 09:19:59 +02:00
Gustav Hansen
6e91003d5a MediaLibraryInput: Fix drag & drop events 2022-07-05 17:57:36 +02:00
Julie Plantey
dd38b618e7
Merge pull request #13687 from strapi/ML-folder/fix-select-tree-disabled 
[ML Folder] Select Tree disabled state
 2022-07-05 17:19:25 +02:00
ronronscelestes
19cdf1e298 feedback fixes 2022-07-05 15:43:41 +02:00
ronronscelestes
fe607a162a Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/track-events-front 2022-07-05 15:14:57 +02:00
Gustav Hansen
b5d1153a6d chore: Update snaphots 2022-07-05 14:53:33 +02:00
Gustav Hansen
1c5f010bd6 chore: Update snapshot tests 2022-07-05 13:23:19 +02:00
Gustav Hansen
4fcb38d53d Merge branch 'master' into features/ML-folder 2022-07-05 12:53:51 +02:00
ronronscelestes
b1be5ab4ee fixed willAddMediaLibraryAssets, number values ignored by Anplitude 2022-07-05 12:31:44 +02:00
ronronscelestes
967558c47f fixed tests 2022-07-05 12:04:13 +02:00
ronronscelestes
9b6785a697 fixed select tree disabled state + style 2022-07-05 11:32:32 +02:00
ronronscelestes
8be071cfa5 improved + commented didEditMediaLibraryElements 2022-07-04 18:30:15 +02:00
ronronscelestes
d2800f485f willAddMediaLibraryAssets 2022-07-04 17:38:45 +02:00
ronronscelestes
fd084ce96e Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/track-events-front 2022-07-04 16:49:23 +02:00
Convly
bdb5a3ee89 Merge branch 'releases/4.3.0' into features/typescript 2022-06-30 16:08:51 +02:00
Convly
f65f5a577f Update frontend snapshots 2022-06-30 15:25:25 +02:00
Julie Plantey
d142f0db61
Merge pull request #13574 from imklau/update-pl-translation 
feat(translations): update and add missing PL translations
 2022-06-24 15:22:35 +02:00
ronronscelestes
de3486a3b7 feedback - renamed parentFolder to currentFolder 2022-06-23 16:36:36 +02:00
ronronscelestes
f02baf9f17 didEditMediaLibraryElements 2022-06-23 13:10:21 +02:00
ronronscelestes
45086ec764 didSelectAllMediaLibraryElements, didFilterMediaLibraryElements, didSortMediaLibraryElements, didSearchMediaLibraryElements, didAddMediaLibraryFolders 2022-06-23 10:54:13 +02:00
ronronscelestes
c62640d3eb Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/bulk-move-select 2022-06-23 09:03:32 +02:00
Gustav Hansen
1ae17aacdf
Merge pull request #13610 from strapi/ML-folder/remove-form-notifications 
[ML Folder] Remove error notifications + trad fixes
 2022-06-22 18:21:09 +02:00
ronronscelestes
6b652a8102 updated propTypes 2022-06-22 17:15:48 +02:00
ronronscelestes
5321120f1a Merge branch 'ML-folder/remove-form-notifications' of https://github.com/strapi/strapi into ML-folder/bulk-move-select 2022-06-22 17:02:08 +02:00
ronronscelestes
07c6dc4ca0 feedback fix FolderDefinition 2022-06-22 17:00:30 +02:00
Gustav Hansen
f4511787cc chore: Update snapshot tests 2022-06-22 16:54:16 +02:00
ronronscelestes
289630ebf9 Merge branch 'ML-folder/bulk-move-select' of https://github.com/strapi/strapi into ML-folder/bulk-move-select 2022-06-22 16:31:29 +02:00
ronronscelestes
1f5ce11abb moved test to BulkMoveButton 2022-06-22 16:29:03 +02:00
ronronscelestes
487138fd3b improved BulkMoveDialog tests 2022-06-22 15:56:41 +02:00
ronronscelestes
bbd8cdbb1d fixed bulk move select tree 2022-06-22 12:55:37 +02:00
ronronscelestes
8b54f5c74f added FolderParentDefinition constant 2022-06-22 11:05:48 +02:00
ronronscelestes
e8b59315ae updated tests 2022-06-21 18:00:31 +02:00
Gustav Hansen
738f3c361f
Merge pull request #13601 from strapi/ML-folder/search-all-level 
[ML folder] Search nested elements
 2022-06-21 12:36:21 +02:00
ronronscelestes
e198b0ef4d translation fixes 2022-06-21 11:29:05 +02:00
ronronscelestes
7dc014a71b fixed form notifications 2022-06-21 10:09:00 +02:00
ronronscelestes
70440baf7a fix handleClickFolderCard 2022-06-21 09:22:20 +02:00