yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 04:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,587 Commits 115 Branches 486 Tags
Commit Graph

829 Commits

Author SHA1 Message Date
David Fariña
5a7e8e9807 Update upload plugin catalan translation 2022-08-30 16:49:56 +02:00
Julie Plantey
9496693a31
Merge pull request #14195 from WalkingPizza/fix/settings-button-sizes 
Make all settings header primary actions small
 2022-08-29 16:51:46 +02:00
Gustav Hansen
c2419b5a0d chore: Update snapshot tests 2022-08-29 12:14:20 +02:00
WalkingPizza
a25d813b6c Update snapshots 2022-08-29 09:50:46 +02:00
WalkingPizza
a3c0b3b10b Make all header primary actions small 2022-08-24 14:49:01 +02:00
Julie Plantey
e309130ae6
Merge pull request #14115 from Hertak/master 
Update es.json
 2022-08-24 10:34:32 +02:00
Gustav Hansen
58a696436f Breadcrumbs: Update snapshot tests & fix prop-types 2022-08-23 14:04:06 +02:00
Gustav Hansen
6da2461d3c BulkMoveButton: Fix prop-types 2022-08-23 13:55:54 +02:00
Gustav Hansen
1a91b52e7c ML: Fix header prop-types 2022-08-23 13:50:13 +02:00
Gustav Hansen
a228ad66bc AssetDialog: Fix prop-types 2022-08-23 13:39:32 +02:00
Hertak
863511fe9f
Update es.json 2022-08-16 17:01:41 -03:00
Marc-Roig
e34381faff Merge branch 'master' into fix/upload-image-without-extension 2022-08-11 16:34:48 +02:00
Marc-Roig
59eb1b7a44 fix tests failing cause of file name 2022-08-11 16:29:04 +02:00
Alexandre Bodin
17866010b7 Apply no promise return 2022-08-11 10:20:50 +02:00
Alexandre Bodin
92955d19f9 Frontend updates 2022-08-11 10:20:49 +02:00
Alexandre Bodin
cf49ddbbfc Prettier and backend fix 2022-08-11 10:20:49 +02:00
Marc-Roig
c7f14a4706 remove function comment as it is self explanatory 2022-08-10 09:14:45 +02:00
Marc-Roig
504c333bcb change function name to getFilenameFromURL 2022-08-10 09:13:15 +02:00
Marc-Roig
7bf2612a15 use last element of path as filename 2022-08-09 18:14:15 +02:00
Julie Plantey
2f0259c0c6 passing parentFolderId to AssetDialog 2022-08-09 18:14:13 +02:00
Marc-Roig
10ea1e4ea2 refactor clean url 2022-08-09 11:43:54 +02:00
Marc-Roig
fce7a9112a change cleanURL description 2022-08-08 14:10:08 +02:00
Marc-Roig
08cb683bd1 clean url when uploading media from url 2022-08-08 14:06:30 +02:00
Julie Plantey
7d31f2282c Merge branch 'master' of https://github.com/strapi/strapi into features/folder-breadcrumbs 2022-08-04 18:34:14 +02:00
Gustav Hansen
d73b847c5c
Merge pull request #13978 from strapi/fix/ml-permissions-view 
ML: Improve canRead and canCreate permission messages
 2022-08-04 17:41:42 +02:00
Julie Plantey
ffde4d4b58 hide breadcrumbs if in root of ML + added tests 2022-08-04 16:25:50 +02:00
Gustav Hansen
838dcc5a01 EmptyOrNoPermissions: simplify getContent() 2022-08-04 15:36:15 +02:00
Gustav Hansen
3c6a58aaea ML: Remove default NoPermissions component 2022-08-04 15:17:56 +02:00
Julie Plantey
324b1628f6 fixed translations 2022-08-04 15:15:55 +02:00
Gustav Hansen
11d021507c ML: Improve canRead and canCreate permission messages 2022-08-04 14:00:23 +02:00
Gustav Hansen
71f290f4c1 Upload: Handle file upload errors gracefully 2022-08-04 12:06:17 +02:00
Julie Plantey
0bcc4b17d2 Merge branch 'master' of https://github.com/strapi/strapi into features/folder-breadcrumbs 2022-08-02 15:59:27 +02:00
Julie Plantey
9fa0adeb8e feedback fixes 2022-08-01 15:41:56 +02:00
Gustav Hansen
d9a7e21abe chore: Update snapshot tests 2022-08-01 15:28:01 +02:00
Julie Plantey
c824230092 added test for getBreadcrumbDataCM 2022-08-01 12:05:18 +02:00
Julie Plantey
bdc0454cd7 breadcrumbs in ML modal - CM 2022-07-31 17:43:42 +02:00
Julie Plantey
110317b6b1 updated snapshots 2022-07-31 16:51:09 +02:00
Julie Plantey
2774384c89 breadcrumbs in upload page 2022-07-31 16:39:47 +02:00
Julie Plantey
e1dc2b8634 list.asset.load translation refacto 2022-07-31 14:56:09 +02:00
Julie Plantey
e0792e28f5 ds beta update 2022-07-31 14:50:35 +02:00
Gustav Hansen
b511597ea2
Merge pull request #13902 from strapi/fix/ml-assetdialog-canread 
AssetDialog: Properly take canRead permissions into account
 2022-07-29 16:40:49 +02:00
Gustav Hansen
7a8a3fd257 AssetDialog: Properly take canRead permissions into account 2022-07-29 14:28:59 +02:00
Gustav Hansen
d67128ed9f ML: Hide bulk actions if not assets or folders exist 2022-07-29 12:34:25 +02:00
Gustav Hansen
887e7b8f7c ML: Add useTracking mocks in tests 2022-07-27 14:11:22 +02:00
Convly
2d6afbf044 Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 10:32:43 +02:00
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