yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-22 06:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 123 Branches 496 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
soupette
574abf33e9 Add edit and duplicate option 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 13:05:23 +01:00
cyril lopez
d056c07cde
Merge pull request #5530 from strapi/front/media-lib-listview 
Media lib full listview
 2020-03-25 19:04:00 +07:00
Pierre Noël
a63c692fca
don't generate default routes when generating plugin api (#5586) 
* don't generate default routes when generating plugin api

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* remove console log

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-03-25 09:31:21 +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
Alexandre BODIN
44d77d8063
Merge pull request #5580 from roelbeerens/feature/missing-auth-mutations 
Added missing forgotPassword, changePassword and emailConfirmation mutations/resolvers
 2020-03-24 18:22:40 +01:00
Alexandre BODIN
b15db81adb
Merge branch 'master' into feature/missing-auth-mutations 2020-03-24 18:22:17 +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
Alexandre BODIN
562b030025
Merge pull request #5584 from joshwnj/fix-default-from-address 
Fix the order of settings in ses provider
 2020-03-24 11:21:46 +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
Virginie Ky
6e24bf1c7f Merge branch 'features/media-lib-frontend' into front/media-lib-listview 2020-03-24 10:51:24 +01:00
soupette
70a05b036b Init request edit file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 10:48:21 +01:00
Virginie Ky
df56b1769d Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-24 10:39:33 +01:00
Virginie Ky
8e273efa8d Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-24 10:38:43 +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
Josh Johnston
b7fd5f28fd Fix the order of settings in ses provider 
Why:

- because there is a default hardcoded value in options.from, the
custom value would never be used.

Signed-off-by: Josh Johnston <josh@x-team.com>
 2020-03-24 19:43:13 +11:00
Alexandre Bodin
e49caedd8e Merge branch 'master' into develop 2020-03-24 09:40:08 +01:00
soupette
b2ee121c20 Add file infos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 09:25:19 +01:00