yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2026-01-05 11:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,138 Commits 141 Branches 515 Tags
Commit Graph

824 Commits

Author SHA1 Message Date
soupette
dfb9530128 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-24 05:41:02 +01:00
soupette
6d8d4482d8 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-24 05:15:56 +01:00
Virginie Ky
b0612257c1 apply code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 22:30:23 +01:00
Alexandre Bodin
d19189b626 Treat mime ncontains as AND params in files list 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-23 17:30:19 +01:00
Virginie Ky
3a539f200d confirm popup on delete 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 12:06:01 +01:00
Alexandre BODIN
dbaa1848dd
Merge pull request #5553 from strapi/media-lib/ordering 
Keep media order set on creation
 2020-03-23 11:21:57 +01:00
Virginie Ky
847f3f1005 enable selectAll with pagination 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 10:40:20 +01:00
Virginie Ky
94265961b4 update unit test 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-22 00:35:22 +01:00
Virginie Ky
655447e24f update generateNewFilters unit test with buffet datepicker format 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-21 22:08:05 +01:00
Virginie Ky
cac1d60139 update generateNewFilters unit test 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-21 21:55:34 +01:00
Virginie Ky
6091652b51 Unit tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-21 21:25:45 +01:00
Virginie Ky
0587843466 unit tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 23:19:18 +01:00
Virginie Ky
ba57f2c801 pdf icons & color 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 22:08:56 +01:00
Alexandre Bodin
e10112ed41 fix(upload): fix error on responsive format when disabled 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 18:32:29 +01:00
Alexandre Bodin
3187c08087 Fix uploadTopEntity and delete file relations on fie delete 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:22 +01:00
Virginie Ky
dea642b907 file type filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-19 23:49:47 +01:00
Virginie Ky
b46058a780 icon type UI 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 23:31:02 +01:00
Virginie Ky
9db29d3390 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-18 11:57:38 +01:00
Virginie Ky
4d731e741e Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-18 10:57:01 +01:00
Virginie Ky
de88f5c34b Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-18 10:51:40 +01:00
Virginie Ky
a78cbf3c22 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 10:49:42 +01:00
Virginie Ky
5614acdf9c filters by mime, tags by type and count 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 00:47:16 +01:00
Virginie Ky
8410e898f3 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/card-preview-integration 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-16 16:27:59 +01:00
virginieky
a2b5b43995
Merge pull request #5481 from strapi/front/media-lib-select-all 
Media library ListView select all
 2020-03-16 15:36:08 +01:00
Virginie Ky
cfe0ddbff8 card preview statement 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-16 15:33:58 +01:00
Alexandre Bodin
3889fb87dc Add previewUrl field and impl in cloudinary 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-16 14:09:35 +01:00
Virginie Ky
1a695b7da9 Apply code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-16 13:37:10 +01:00
Alexandre Bodin
8bac1b1835 Add extend method in provider prototype 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-14 18:29:36 +01:00
Alexandre Bodin
0137df7a7e Serve upload file with upload middleware not the public one 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-14 17:35:35 +01:00
Virginie Ky
f4d1359f50 apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-13 16:16:41 +01:00
Alexandre Bodin
55bdc146b7 Remove video preview setting 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-13 15:41:15 +01:00
soupette
f99f83af02 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-13 11:04:45 +01:00
Alexandre BODIN
9ab43d2c42
Merge branch 'master' into fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 2020-03-12 16:10:56 +01:00
Alexandre Bodin
eb76a07daf Update media-lib features according to spec changes 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-12 14:25:50 +01:00
Virginie Ky
f9574aac62 refacto 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-11 22:53:27 +01:00
Virginie Ky
8ed0849432 delete multiple medias 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-11 22:50:02 +01:00
Alexandre Bodin
02d042769f Remove file sha that was not standard 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-10 17:26:15 +01:00
Virginie Ky
03d290ba73 image crop and other files display 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-10 16:32:12 +01:00
Virginie Ky
b1e184833b Merge branch 'features/media-lib' of github.com:strapi/strapi into front/card-preview-integration 2020-03-10 14:31:00 +01:00
Virginie Ky
d00e806245 simplify handleSelectAll 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-10 11:37:13 +01:00
Virginie Ky
503df37fec Error state with icon and message ui 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-10 11:32:52 +01:00
Ky
a735697f99 clean reducer 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-10 01:27:59 +01:00
Ky
3189cc656a ListView Select and unselect all 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-10 01:24:49 +01:00
Ky
b1446ec82a clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-10 00:37:14 +01:00
Ky
762cb6bba6 generalize img card 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-10 00:27:18 +01:00
Alexandre Bodin
2b5c332e09 Clean up 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-09 22:11:56 +01:00
Alexandre Bodin
571e829b7a Fix typos 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-09 21:52:23 +01:00
Alexandre Bodin
939c8354c0 Create file formatters 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-09 21:52:23 +01:00
Virginie Ky
e1e85ab452 card integration 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-09 19:12:21 +01:00
Virginie Ky
75efcfe4a2 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/card-preview-integration 2020-03-09 15:08:12 +01:00