yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 20:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 117 Branches 489 Tags
Commit Graph

907 Commits

Author SHA1 Message Date
soupette
e56f92e200 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into features/media-lib-control-design 2020-03-25 15:33:07 +01:00
soupette
ec72b56f4f Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 15:21:02 +01:00
soupette
091248d25a Add hover design to controls 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 15:13:45 +01:00
soupette
e7938eedc2 Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 14:57:52 +01:00
HichamELBSI
104282c47c Merge branch 'features/media-lib-frontend' into media-lib/input-media 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-25 14:56:59 +01:00
soupette
9a6a0668eb Disable form while cropping an existing file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 13:30:58 +01:00
soupette
9283e564de Remove loading between refetch 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 13:16:42 +01:00
soupette
574abf33e9 Add edit and duplicate option 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 13:05:23 +01:00
HichamELBSI
a08c8e0dfa Add input file 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-25 01:14:43 +01:00
Virginie Ky
f3b53e5515 listview video preview ip 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-24 22:57:41 +01:00
soupette
349e45ac2a Fix design 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 16:11:03 +01:00
soupette
7d9dbb84a9 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 15:47:54 +01:00
soupette
2302ee4ca6 Add delete logic from edit modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 15:19:49 +01:00
Virginie Ky
278b708449 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-24 15:17:09 +01:00
soupette
eff2404db2 Fix crop size box 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 14:46:43 +01:00
cyril lopez
118e233149
Merge pull request #5554 from strapi/media-lib/cm-modal 
Add List view modal
 2020-03-24 20:35:40 +07:00
Virginie Ky
ccf2c5741b Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-24 14:32:47 +01:00
soupette
706a0238f6 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-24 14:15:59 +01:00
Alexandre Bodin
a17770293d Allow file info edit whitout re upload 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-24 12:21:51 +01:00
soupette
375f930189 Handle replace media and force update pic 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 11:52:11 +01:00
Virginie Ky
a3507d7181 listview padding bottom 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-24 11:11:47 +01:00
soupette
70a05b036b Init request edit file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 10:48:21 +01:00
HichamELBSI
3cb1284876 Fix select all 2020-03-24 10:31:40 +01:00
Virginie Ky
28cc83d17b get list data with formatted params 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-24 10:18:09 +01:00
HichamELBSI
998bfa9360 Merge branch 'features/media-lib-frontend' into media-lib/cm-modal 2020-03-24 09:56:55 +01:00
soupette
b2ee121c20 Add file infos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 09:25:19 +01:00
soupette
10c5c2d84f Add download option 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 08:48:14 +01:00
soupette
6ae7395bf0 Init edit existing file and add copy button 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 07:35:16 +01:00
soupette
664db67436 Add delete logic to modal list upload 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 05:54:13 +01:00
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
HichamELBSI
0044f5e7a7 Fix second review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-24 00:11:16 +01:00
HichamELBSI
f19fb580ec Update after review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-23 23:28:30 +01:00
Virginie Ky
21f4e9fa2d Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-lib-listview 2020-03-23 22:32:07 +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
HichamELBSI
2f4b7b4552 Add List view modal 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-20 17:12:23 +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