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

12264 Commits

This Branch
This Branch
All Branches
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
cyril lopez
7540556e62
Merge pull request #5613 from strapi/ml/thumbnail-fix 
ML front improvements
 2020-03-27 15:39:44 +07:00
soupette
2e525a7f65 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-27 07:47:17 +01:00
soupette
56349bef71 Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-27 07:46:47 +01:00
soupette
f8f4f82693 Remove input file from helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 06:32:57 +01:00
soupette
3658e31dda Remove old input file and content manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 06:28:53 +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
cyril lopez
b57ab10340
Merge pull request #5601 from strapi/features/media-lib-fix-design 
Fix file info box baseline
 2020-03-27 00:32:37 +07: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
cyril lopez
6cdf0a7891
Merge pull request #5610 from strapi/features/media-lib-fix-bugs 
ML fix front-end bugs
 2020-03-26 21:19:25 +07: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
6a9ce6bc31 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-fix-bugs 2020-03-26 14:48:42 +01:00
soupette
5fce255d2b Use thumbnail url 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 14:48:06 +01:00
cyril lopez
d5b4127e14
Merge pull request #5606 from strapi/features/media-lib-reorder-media-front 
Media reorder logic
 2020-03-26 20:23:28 +07:00
soupette
024ce975f1 Comment config 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 14:22:21 +01:00
soupette
3eb635380a Fix ctb allowed types 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 14:15:24 +01:00
Alexandre Bodin
bd5f3cb1ab Wrap cloudinary error info in an error object 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-26 14:01:45 +01:00
Alexandre BODIN
9fdb650c6c
Fix rerouting of destroy route in user-perm (#5581) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-26 13:55:52 +01:00
soupette
7840578474 Fix ctb 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 13:50:45 +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
Paul Jordaan
5423c14728
Remove condition that reset query start param (#5557) 
Every time the menu got closed the start condition for the query would get reset to  0. Expected behavior would be to load the next set of results.

Signed-off-by: Paul <paul@flow.rent>
 2020-03-26 12:14:45 +01:00
Alexandre BODIN
8aafa1b53a
Merge pull request #5607 from strapi/fix/#5190/badSingularFormOfColumnNameInQuery 
Fix bad singular form of column name
 2020-03-26 11:47:37 +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
Pierre Noël
af1636b301 fix bad singular form of column name 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-26 11:21:17 +01:00