yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-23 15:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 127 Branches 496 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
soupette
dfb9530128 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-24 05:41:02 +01:00
soupette
6d8d4482d8 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-24 05:15:56 +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
21f4e9fa2d Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-lib-listview 2020-03-23 22:32:07 +01:00
Virginie Ky
efd5d95c6f Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-23 22:31:21 +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
Alexandre BODIN
c55c94c7dd
Merge pull request #5547 from strapi/fix/#3889/wrongPathGenerateModelInPlugin 
fix generate:model --plugin path + little refacto of code
 2020-03-23 19:02:28 +01:00
Alexandre BODIN
57fe38c2bb
Merge pull request #5575 from strapi/media-lib/filters 
Treat mime ncontains as AND params in files list
 2020-03-23 18:05:50 +01:00
Alexandre BODIN
ea77e6c8f9
Merge branch 'master' into fix/#3889/wrongPathGenerateModelInPlugin 2020-03-23 18:05:28 +01:00
Roel Beerens
2570e27238 feat: Added missing forgotPassword, changePassword and emailConfirmation mutations/resolvers. Made a slight adjustment to the emailConfirmation controller function in Auth.js to return a UsersPermissionsLoginPayload when using GraphQL 
Signed-off-by: Roel Beerens <roel@gravity.nl>
 2020-03-23 18:02:26 +01:00
Alexandre Bodin
fa276b2447 Do not set where clause if none present. Avoids using distinct 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-23 17:47:27 +01:00
Alexandre BODIN
ce7db06ac9
Merge pull request #5578 from diogotcorreia/fix/#5577 
Make UID searchable in Mongoose and avoid errors if content type can't be searched
 2020-03-23 17:40:50 +01:00
Alexandre Bodin
d19189b626 Treat mime ncontains as AND params in files list 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-23 17:30:19 +01:00
Alexandre Bodin
72440af84b Merge branch 'develop' into features/media-lib 2020-03-23 17:28:21 +01:00
Alexandre Bodin
ab9f7d0207 Merge branch 'master' into develop 2020-03-23 17:28:09 +01:00