yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 19:56:41 +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
Alexandre Bodin
e10112ed41 fix(upload): fix error on responsive format when disabled 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 18:32:29 +01:00
virginieky
b4fb4829fc
Merge pull request #5551 from strapi/front/ui-fixes 
Some UI fixes
 2020-03-20 18:16:44 +01:00
HichamELBSI
2f4b7b4552 Add List view modal 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-20 17:12:23 +01:00
Mattias van den Belt
f8023cc66c
Update Dutch Translation and Typos [NL] (#5523) 
* Update Dutch Translation

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Add new translation keys

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update strapi-admin translation [NL]

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Sort translation [NL]

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update dutch content-types translations

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

Co-authored-by: Nikolay Tyurin <kolya_tyurin@mail.ru>
 2020-03-20 17:10:55 +01:00
Pierre Noël
ff1fbcdfba small refacto 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-20 16:44:25 +01:00
Virginie Ky
59c567aa3c clean numberOfVisibleItems prop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 16:40:55 +01:00
Virginie Ky
8d52924783 apply design review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 15:09:06 +01:00
nikolasmelui
a74239c19c
Fix syntax error (#5516) 2020-03-20 14:45:47 +01:00
Virginie Ky
df1e81d317 Merge branch 'front/ui-fixes' of github.com:strapi/strapi into front/ui-fixes 2020-03-20 14:41:47 +01:00
Virginie Ky
541cd72e97 Admin leftmenu bullet icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 14:40:56 +01:00
Kim, Harim
40ea493b26
Fix context issue in custom GraphQL query and mutation (#5532) 
* fix context issue in custom query and mutation

Signed-off-by: harimkims <harimkims@gmail.com>

* merge only state-related context

Signed-off-by: harimkims <harimkims@gmail.com>

* roll back the code, fix the test instead

Signed-off-by: harimkims <harimkims@gmail.com>
 2020-03-20 14:24:14 +01:00
virginieky
4392eaff7e
Merge branch 'develop' into front/ui-fixes 2020-03-20 14:05:40 +01:00
Ralph
dae9cfa415
Make plugins documentation generation optional (#5465) 
* Make plugins documentation generation optional

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Removing "-" character from schema names for generated plugin documentation so it becomes compatible with AWS API gateway import API feature using OAS file. Adding only one property to the settings file pluginsForWhichToGenerateDoc so that the user can choose for which plugin he wishes to generate documentation. Adding a parameter to generate or not the default response (this can now be set to false to have a documentation that is compatible with AWS API Gateway).

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Updating settings.json to start without the pluginsForWhichToGenerateDoc key so that all plugins documentation gets generated by default. Updated the documentation to reflect this change.

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Updating documentation to correct typos and rephrase some sentences to make them more clear.

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Destructuring the config to the var pluginsForWhichToGenerateDoc instead of renaming it to take into account comment from Alexandre Bodin

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Destructuring generateDefaultResponse and pluginsForWhichToGenerateDoc from strapi config object based on feedback from Alexandre Bodin

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-03-20 14:03:51 +01:00
Dacre Denny
45d83ea3f5
Removed unused 'cb' callback on send method of Email service and Email providers (#5371) 
Signed-off-by: dacre-denny <dacre@mooce.co.nz>
 2020-03-20 14:02:47 +01:00
Pierre Noël
5ffe33c530 fix manyWay deep filtering when the relation is self 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-20 13:18:51 +01:00
Alexandre Bodin
be24f640d9 some cleanup 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:06:47 +01:00
Alexandre Bodin
c7f10bfede Update populate to keep array order 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:24 +01:00
Alexandre Bodin
01fe498407 Delete fk for oneToOne and oneToMany mongo 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:24 +01:00
Alexandre Bodin
c8de166051 Add deleteRelations logic in connectors 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:23 +01:00
Alexandre Bodin
0c395eef7e Support order bookshelf 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:23 +01:00
Alexandre Bodin
df14b08618 Add file ordering 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:22 +01:00
Alexandre Bodin
3187c08087 Fix uploadTopEntity and delete file relations on fie delete 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:22 +01:00
Alexandre Bodin
ed2b973b99 Merge branch 'develop' into features/media-lib 2020-03-20 11:04:10 +01:00
Virginie Ky
dc12ab9905 Merge branch 'front/ui-fixes' of github.com:strapi/strapi into front/ui-fixes 2020-03-20 10:09:52 +01:00
Virginie Ky
12116c149b update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 10:09:32 +01:00
virginieky
163db4db32
Merge branch 'develop' into front/ui-fixes 2020-03-20 09:38:18 +01:00
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
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