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

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Virginie Ky
6ac715abf7 leftmenu dropdown alignment 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 09:36:53 +01:00
Jelmer Visser
7f3be5eb04 Return newObj instead of original object 
Signed-off-by: Jelmer Visser <jelmer@weflycheap.nl>
 2020-03-20 09:27:05 +01:00
Jelmer Visser
4bda9f3104 Leave custom resolvers alone when diff 
Signed-off-by: Jelmer Visser <jelmer@weflycheap.nl>
 2020-03-20 09:27:05 +01:00
Alexandre BODIN
5ad4dc90fb
Merge pull request #5541 from strapi/docs/one-click_do 
Minor fixes to DO one-click docs
 2020-03-20 09:19:47 +01:00
Virginie Ky
83b326e9a5 leftmenu alignment and border listbutton 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 09:19:43 +01:00
Virginie Ky
dea642b907 file type filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-19 23:49:47 +01:00
Pierre Noël
85e2dd5b53 fix generate:model --plugin path + little refacto of code 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-19 18:35:08 +01:00
Pierre Noël
262d3e4364 Revert "fix generate:model --plugin path + little refacto of code" 
This reverts commit d64af252bf251a4229e853833f390b79891e97bb.
 2020-03-19 18:33:13 +01:00
Pierre Noël
d64af252bf fix generate:model --plugin path + little refacto of code 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-19 18:29:30 +01:00
Derrick Mehaffy
734ce70df4 Minor fixes to DO one-click docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-18 22:29:06 -07:00
Virginie Ky
b46058a780 icon type UI 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 23:31:02 +01:00
Pierre Noël
8aa50cd80c Fix deep filtering for manyWay 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-18 17:15:24 +01:00
Virginie Ky
9db29d3390 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-18 11:57:38 +01:00
Virginie Ky
4d731e741e Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-18 10:57:01 +01:00
Virginie Ky
de88f5c34b Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-18 10:51:40 +01:00
Virginie Ky
a78cbf3c22 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 10:49:42 +01:00
Virginie Ky
5614acdf9c filters by mime, tags by type and count 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 00:47:16 +01:00
virginieky
1a1cd7bb74
Merge pull request #5482 from strapi/front/card-preview-integration 
Card preview integration
 2020-03-17 14:58:21 +01:00
Alexandre BODIN
ac1898ee9f
Merge pull request #5519 from strapi/fix/#4556/nullWhenRequiringAComponentInRelationGraphQl 
fix(graphql): null when requiring a component in relation graph ql
 2020-03-17 09:42:22 +01:00
Alexandre BODIN
b9579fd3f0
Merge pull request #5515 from strapi/media-lib/improvements 
Media lib improvements
 2020-03-17 09:40:50 +01:00
virginieky
3e64019fda
Merge pull request #5451 from strapi/front/editview-alignment 
Some alignment fixes
 2020-03-16 16:47:40 +01:00
virginieky
3fdc9c7d95
Merge branch 'develop' into front/ui-improvements 2020-03-16 16:47:01 +01:00
Virginie Ky
8410e898f3 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/card-preview-integration 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-16 16:27:59 +01:00
Pierre Noël
c3f011ddba Merge branch 'master' into fix/#4556/nullWhenRequiringAComponentInRelationGraphQl 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-16 15:49:59 +01:00
Pierre Noël
9990759dd5 always populate with components 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-16 15:43:03 +01:00
virginieky
a2b5b43995
Merge pull request #5481 from strapi/front/media-lib-select-all 
Media library ListView select all
 2020-03-16 15:36:08 +01:00
Virginie Ky
cfe0ddbff8 card preview statement 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-16 15:33:58 +01:00
Virginie Ky
fe20425215 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-03-16 14:52:58 +01:00
Nikolay Tyurin
9bbb395e3a
Update graphql.md (#5510) 
changed link in the https://www.apollographql.com/
 2020-03-16 14:17:59 +01:00
Alexandre Bodin
3889fb87dc Add previewUrl field and impl in cloudinary 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-16 14:09:35 +01:00
chrisyates
59c03378cb
Correct Platform.sh name (#5480) 2020-03-16 13:40:11 +01:00
Virginie Ky
1a695b7da9 Apply code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-16 13:37:10 +01:00
Alexandre BODIN
5694372e33
Merge pull request #5485 from strapi/docs-updates 
Add single type examples
 2020-03-16 10:39:21 +01:00
Alexandre BODIN
863ac59f6a
Merge branch 'master' into docs-updates 2020-03-16 10:07:52 +01:00
Alexandre Bodin
8bac1b1835 Add extend method in provider prototype 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-14 18:29:36 +01:00
Alexandre Bodin
0137df7a7e Serve upload file with upload middleware not the public one 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-14 17:35:35 +01:00
Alexandre BODIN
13f6ef1d80
Merge pull request #5502 from strapi/media-lib/remove-preview 
Remove video preview setting
 2020-03-13 17:52:05 +01:00
Virginie Ky
f4d1359f50 apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-13 16:16:41 +01:00
Alexandre Bodin
55bdc146b7 Remove video preview setting 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-13 15:41:15 +01:00
Alexandre Bodin
243085dae1 Merge branch 'develop' into features/media-lib 2020-03-13 15:40:11 +01:00
Shabith Ishan Thennakone
fe19bcb2ea removed text-transform from variable name 2020-03-13 14:51:32 +01:00
Jim LAURIE
875432cc33
Merge pull request #5493 from strapi/docs/do-one-click 
Update DigitalOcean one-click docs for recent changes
 2020-03-13 14:32:46 +01:00
Jim LAURIE
dcb7be51d1
Merge branch 'master' into docs/do-one-click 2020-03-13 14:32:26 +01:00
Pierre Noël
1227bfeba4 add possibility to set a relation "private" 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-13 12:23:11 +01:00
Pierre Noël
65a3e83ee3 Change error message when bookshelf db connection fails at start 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-13 12:20:06 +01:00
soupette
1686cc051f Fix select all 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-13 11:13:26 +01:00
soupette
f99f83af02 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-13 11:04:45 +01:00
Derrick Mehaffy
7f87d86d6d
Update DO Docs per https://github.com/strapi/one-click-deploy/pull/6 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-13 02:53:29 -07:00
cyril lopez
b24a548c0f
Merge pull request #5500 from strapi/features/media-lib-ctb-option 
Media lib add allowed types to [CTB]
 2020-03-13 10:46:20 +01:00
soupette
4ab399af48 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-13 10:28:57 +01:00