yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-07 14:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,648 Commits 104 Branches 502 Tags
Commit Graph

12648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
soupette
38b7823b34 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-26 08:01:22 +01:00
soupette
45b7f7af5f Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-26 08:00:50 +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
cyril lopez
183bd2db6c
Merge pull request #5598 from strapi/features/media-lib-frontend 
ML front-end part
 2020-03-25 21:55:13 +07:00
cyril lopez
2ba117d1e3
Merge pull request #5597 from strapi/features/media-lib-control-design 
Add hover state to controls
 2020-03-25 21:50:26 +07: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
cyril lopez
15eaa698f2
Merge pull request #5594 from strapi/features/media-lib-edit-file 
Media lib edit file
 2020-03-25 21:29:36 +07: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
2bdcf01c97 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into features/media-lib-edit-file 2020-03-25 13:07:36 +01:00