yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,425 Commits 129 Branches 498 Tags
Commit Graph

1434 Commits

Author SHA1 Message Date
Virginie Ky
4fde5d4d63 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fixes 2020-03-30 12:04:55 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
HichamELBSI
fada750b28 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-30 10:58:42 +02:00
HichamELBSI
da3347c50b Merge branch 'features/media-lib' into media-lib/cm-finalization 2020-03-30 10:21:55 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 2020-03-30 09:57:05 +02:00
soupette
ec5e960758 Fix tests labels 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-30 09:49:12 +02:00
soupette
32266e042c Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/fix-img-cache 2020-03-30 07:42:01 +02:00
HichamELBSI
b4dd5ef7f5 Merge branch 'features/media-lib' into media-lib/cm-finalization 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-29 17:10:20 +02:00
Virginie Ky
cec4875f43 play icon and size filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-28 14:13:20 +01:00
Virginie Ky
85409813f4 confirm on deleteAll cancel 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-28 13:35:56 +01:00
cyril lopez
22bb8fe223
Merge pull request #5621 from strapi/ml/fix-upload-error 
ML/fix upload error
 2020-03-27 16:53:52 +01:00
Alexandre Bodin
9c2f5b5368 fix update file info whith realted 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-27 16:00:26 +01:00
HichamELBSI
a17fc7eebd Content Manager - Finalization 2020-03-27 15:41:04 +01:00
soupette
7e7f1c30db Fix file size due to backend code legacy 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 15:28:46 +01:00
soupette
0ba62386c1 Use thumbnail url when available and fix ml preview in ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 14:54:03 +01:00
soupette
80e6fb7d8b Fix bug when file is empty 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 14:29:04 +01:00
Virginie Ky
3c5cb15c31 lockApp on deleteAll 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-27 12:13:19 +01:00
soupette
3da916340b Fix util prefixFileWithBackendUrl 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 11:55:06 +01:00
soupette
87e72fb4c6 Fix unnecessary rerender 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 11:49:07 +01:00
soupette
dc9bf93a1a Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/fix-upload-error 2020-03-27 10:58:02 +01:00
soupette
71f0da38f9 Fix upload error 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 10:56:36 +01:00
virginieky
1274645f0e
Merge pull request #5617 from strapi/features/media-lib-remove-old-files 
Clean old files
 2020-03-27 10:44:17 +01:00
soupette
bfa4d3f798 Add code source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 06:25:38 +01:00
soupette
c6700f06b5 Remove OLD folder 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 19:15:54 +01:00
soupette
6577c2ee6d Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/thumbnail-fix 2020-03-26 18:32:48 +01:00
soupette
1720d4ce66 Created SizeBox component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 18:27:05 +01:00
soupette
e6a271adf2 Replace dynamic size boxe 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 18:19:22 +01:00
soupette
611353785f Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/thumbnail-fix 2020-03-26 18:13:23 +01:00
soupette
d25417a142 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 18:11:47 +01:00
soupette
b99f0f461d Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-fix-design 2020-03-26 18:10:35 +01:00
cyril lopez
430758eb91
Merge pull request #5609 from strapi/front/media-lib-preview-video 
Media lib preview video & player video
 2020-03-27 00:09:09 +07:00
soupette
6d5a4ddf60 Fix size box display 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 17:33:28 +01:00
Virginie Ky
972174e501 apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-26 17:33:14 +01:00
soupette
6d08e19fda Fix background-color 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 17:01:38 +01:00
soupette
1a22cc82ca Fix formatBytes 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 16:45:45 +01:00
soupette
33140c7ded Remove noisy notif 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 16:21:20 +01:00
soupette
620e87371c Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/thumbnail-fix 2020-03-26 16:19:25 +01:00
soupette
833add6406 Use thumbnail when available 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 16:11:42 +01:00
Virginie Ky
33dbbf5498 hide play icon on CM 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-26 16:07:14 +01:00
Alexandre Bodin
5de985d724 Clear db formats on replace 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-26 15:52:56 +01:00
soupette
2f5c73dde5 Use correct url for edit 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 15:12:39 +01:00
Virginie Ky
810c918786 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-lib-preview-video 2020-03-26 15:09:12 +01:00
soupette
5fce255d2b Use thumbnail url 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 14:48:06 +01:00
soupette
a9b4b10d88 Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 13:05:25 +01:00
soupette
124fbfc3c7 Merge branch 'features/media-lib-reorder-media-front' of github.com:strapi/strapi into features/media-lib-fix-bugs 2020-03-26 12:58:29 +01:00
soupette
d9e21eecd2 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 12:57:41 +01:00
soupette
2314d4ee46 Fix download 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 12:39:12 +01:00
soupette
2841b806c4 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-fix-bugs 2020-03-26 12:34:54 +01:00
soupette
86f6ad6d45 Fix delete media 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 12:34:43 +01:00
Virginie Ky
100572b4d0 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-26 12:27:40 +01:00