yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,797 Commits 122 Branches 507 Tags
Commit Graph

11797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
3e4c9d95d0
Merge pull request #5536 from strapi/fix/#4487/filteringDataManyWayError500 
Fix deep filtering for manyWay
 2020-03-23 14:03:12 +01:00
Pierre Noël
39648047a7 Merge branch 'master' into fix/#4487/filteringDataManyWayError500 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 12:01:20 +01:00
Pierre Noël
0c7029c2b1 lint 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 12:00:13 +01:00
Loren
88de1fa692
Fixed sentence structure and grammatical errors. (#5507) 
* Fixed sentence structure and grammatical errors.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Fixed additional grammatical mistakes.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Fixed additional grammatical mistakes

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Updated plugin link to point to beta 3.0.0 docs.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>
 2020-03-22 18:30:31 +01:00
Michael-Scott-PC
e56fa01c1c
Documentation improvements 2020-03-22 18:28:03 +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
nikolasmelui
a74239c19c
Fix syntax error (#5516) 2020-03-20 14:45:47 +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
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
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
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
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
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
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
Nikolay Tyurin
9bbb395e3a
Update graphql.md (#5510) 
changed link in the https://www.apollographql.com/
 2020-03-16 14:17:59 +01:00
chrisyates
59c03378cb
Correct Platform.sh name (#5480) 2020-03-16 13:40:11 +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
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
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
Alexandre BODIN
310fc3d0cd
Merge pull request #5452 from strapi/fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 
Fix find one cant have multiple parameters when there is a primary key
 2020-03-13 09:42:22 +01:00
cyril lopez
eb9a4d6809
Merge pull request #5488 from strapi/fix/dz 
Fix dynamic zone reorder input file and date updates
 2020-03-12 17:44:52 +01:00
cyril lopez
cba1d69694
Merge branch 'master' into fix/dz 2020-03-12 17:04:46 +01:00
Alexandre BODIN
9ab43d2c42
Merge branch 'master' into fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 2020-03-12 16:10:56 +01:00
soupette
0b5ba26b4d Add package.json to copied files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
soupette
a46590feda Add infos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
soupette
e47b451f7c Require version from package.json instead of using the data from the back-end 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
Jozef Cipa
e8c4629779
Fix/admin path serve (#5287) 
* Add config option to disable serving admin assets

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>

* Add serveAdminPanel option to docs

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>

* Inherit default value for serving admin from config

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>
 2020-03-12 09:39:25 +01:00
Brad Christie
b2d19c8ad8
Add --no-run and --use-npm (#5420) 
Not sure if you want to call-out that it will leverage yarn if/when possible (if npm flag is not set).

Did notice other APIs need an update, but unsure how `---tpl` relates to new cli. I assume it's been refactored into `--extend`, but unsure.

Signed-off-by: Brad Christie <bch@sitecore.net>
 2020-03-12 09:34:01 +01:00
Alexandre BODIN
a13b7b0d5a
Merge pull request #5426 from nazrdogan/patch-1 
fix typo
 2020-03-12 09:33:12 +01:00
Alexandre BODIN
1a86d4395e
Merge pull request #5407 from ScottAgirs/patch-1 
Minor typo fixes
 2020-03-12 09:31:44 +01:00
Alexandre BODIN
78735792d7
Merge pull request #5486 from fodkastir/master 
fix #5399 Strapi is not using the configured host when launching the server
 2020-03-11 17:07:40 +01:00
soupette
ec47ad9b92 Remove 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-10 17:54:11 +01:00
soupette
d0841bc8b7 Remove useless ct 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-10 17:53:44 +01:00
Yen
222903baab use host value defined in config when launching server 
Signed-off-by: Yen <fodkastir@gmail.com>
 2020-03-10 11:01:56 -05:00
Jim LAURIE
6ef529b3a1 docs: rewrite sentence 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-10 17:01:44 +01:00
Jim LAURIE
11aeae4dc7 docs: add single type examples 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-10 16:47:41 +01:00
Pierre Noël
15f4ae67d7 add test for replaceIdByPrimaryKey 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-10 16:44:28 +01:00