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

907 Commits

Author SHA1 Message Date
Virginie Ky
3c5cb15c31 lockApp on deleteAll 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-27 12:13:19 +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
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
Alexandre Bodin
ceb113a865 Add count search on files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-25 19:17:46 +01:00
soupette
082bdfb416 Fix info box baseline 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 18:00:30 +01:00
Alexandre Bodin
ff3c7a4410 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib 2020-03-25 17:34:49 +01:00
Alexandre Bodin
cfdbf5423a Add file search and create simple sqlite search 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-25 17:34:39 +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