yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-30 10:53:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,648 Commits 122 Branches 499 Tags
Commit Graph

634 Commits

Author SHA1 Message Date
Virginie Ky
100572b4d0 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-26 12:27:40 +01:00
Virginie Ky
c187ab963c Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-lib-preview-video 2020-03-26 12:18:26 +01:00
Virginie Ky
a7fa9e7276 display previewUrl 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-26 12:15:00 +01:00
Virginie Ky
4f85819475 display video on editform with play and pause actions 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-26 11:44:38 +01:00
soupette
7931ee2fee mend 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 11:14:57 +01:00
soupette
cb20593e17 Add preview when dragging 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 10:57:31 +01:00
soupette
67dc897e67 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-reorder-media-front 2020-03-26 10:25:59 +01:00
soupette
b07f445824 Add dnd and reorder files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 10:22:09 +01:00
ELABBASSI Hicham
d06aa78f5f
Merge pull request #5600 from strapi/features/media-lib-download-file 
Add download file option
 2020-03-26 09:47:14 +01:00
soupette
06c3dace12 Created sortableList compo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 09:30:44 +01:00
Virginie Ky
9de45c5998 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-lib-preview-video 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-25 21:43:28 +01:00
Virginie Ky
343ae7c6f6 List VideoPreview with duration and play icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-25 21:40:51 +01:00
soupette
082bdfb416 Fix info box baseline 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 18:00:30 +01:00
soupette
d980448e1b Add download option 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 17:07:12 +01:00
ELABBASSI Hicham
d3f2cdbe5f
Merge pull request #5592 from strapi/media-lib/input-media 
Add input file
 2020-03-25 16:10:03 +01:00
HichamELBSI
e1005e222c Merge branch 'features/media-lib-frontend' into media-lib/input-media 2020-03-25 16:07:06 +01:00
soupette
17e2f3b901 Remove test compo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 16:06:29 +01:00
HichamELBSI
eae7e7ec1d Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-25 15:45:40 +01:00
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
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
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
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
b0612257c1 apply code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 22:30:23 +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
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