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

1363 Commits

Author SHA1 Message Date
soupette
243394b484 Fix existing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 18:16:52 +02:00
soupette
96e0f1fd20 Add upload from url option in plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 17:54:12 +02:00
cyril lopez
40eea551f1
Merge pull request #5663 from strapi/media-lib/fix-sizes 
Fix sizes for non uploaded files (Edit file and Upload list)
 2020-03-31 17:50:34 +02:00
HichamELBSI
b6c1d79ac7 Fix sizes for non uploaded files 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-31 17:35:58 +02:00
Alexandre Bodin
6f1f774146 Refactor combineFilters 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-31 16:56:49 +02:00
HichamELBSI
4a475106ac Add tooltip to card control actions 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-31 16:30:55 +02:00
soupette
bf8710b12b Created input upload 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 16:28:12 +02:00
soupette
de61549087 Fix fetch error 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 14:46:54 +02:00
Alexandre Bodin
168ceefa87 Add same filter logic to file count 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-31 14:32:00 +02:00
Ky
74c9caca66 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fixes 2020-03-31 12:21:42 +02:00
Ky
b5f930d3fa Unit tests and remove useDeepCompare hook 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-31 11:57:03 +02:00
soupette
f62785e4cd Add empty view with filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 11:25:26 +02:00
HichamELBSI
aeff7869aa Fix PR review 2020-03-31 10:05:13 +02:00
Ky
41987c5c79 refetch on filter delete 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-31 00:18:27 +02:00
Ky
8b0f4bb994 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fixes 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-30 23:00:49 +02:00
Ky
d9e7fd8087 modal list alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-30 22:54:55 +02:00
Virginie Ky
8674ed3576 filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 22:13:49 +02:00
HichamELBSI
210bb4985a Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-30 18:49:49 +02:00
HichamELBSI
592e44bd43 Finalize content manager media lib 2020-03-30 17:18:10 +02:00
HichamELBSI
0b7872e0a8 Add Drop file into input media 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-30 16:40:46 +02:00
HichamELBSI
1276bf9767 Add input allowed types in filters 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-30 16:40:03 +02:00
cyril lopez
a97b884ac7
Merge pull request #5628 from strapi/media-lib/cm-finalization 
Input file Actions
 2020-03-30 16:26:15 +02:00
HichamELBSI
332fce9e49 Format file id 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-30 16:24:40 +02:00
Alexandre Bodin
b3a6114328 Defer pulibc and uplaod middlewares 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 16:05:29 +02:00
Virginie Ky
7917b163c4 apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 15:58:03 +02:00
Virginie Ky
7f7542a5ca homepage reducer unit test 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 15:54:11 +02:00
Virginie Ky
911285bf84 PR review apply and pagination default value 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 15:23:32 +02:00
Virginie Ky
0b1b3f2a59 pagination default value 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 15:19:17 +02:00
Virginie Ky
6e060d18d8 PR review apply 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 14:13:11 +02:00
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