yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-23 00:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,751 Commits 111 Branches 484 Tags
Commit Graph

96 Commits

Author SHA1 Message Date
Bruno Santos
9f2e2c1582
Fix typo in upload plugin documentation (#7378) 2020-08-10 07:31:14 -07:00
Pierre Noël
75be8688d2 DOC replace .html by .md 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-23 11:09:42 +02:00
Alexandre Bodin
cd710d34e0 Merge branch 'master' into documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-16 17:10:06 +02:00
Shahein Moussavi
580102f0a5
Make Strapi GraphQL an implementing service for Federation (#6146) 
* Add Strapi GraphQL to Apollo Federation as implementation

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>

* updated graphql plugin documentation for federation

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>

* Creating separate package while waiting for Strapi PR acceptance

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>

* v3.1.0-beta.0

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>

* Accidentally pushed bad changes

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>

* used lodash for config variable for consistency, updated comment to be more descriptive

Signed-off-by: Shahein Moussavi <shaheinm@gmail.com>
 2020-07-16 09:09:59 +02:00
Scott Agirs
fef24faf63
[typofix] Client ID > Client Secret (#6786) 
* [typofix] Client ID > Client Secret

Signed-off-by: ScottAgirs <scott@ijs.to>

* [revert] avoid arrowParens

Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-06-24 17:38:35 +02:00
Jim LAURIE
6b23cedc46 docs: fix 404 links 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-06-18 12:33:18 +02:00
Tudor Ilisoi
03a0422699
fixed spelling 
Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
 2020-06-01 23:13:13 +03:00
Alexandre Bodin
0d5ccbfd2d Merge branch 'master' into documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-26 15:12:18 +02:00
Riley Shea
4f2ded3c53
Erroneous double quote syntax error (#6257) 
Erroneous double quote in custom  extensions/documentation/config/settings.json example
 2020-05-25 18:33:09 +02:00
Alexandre BODIN
61c0c9d9b4
Add v3.x and remove alpha docs (#6344) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 18:11:45 +02:00
Alexandre BODIN
f32bc7b30b
Merge pull request #5655 from ScottAgirs/patch---adjust-naming-to-password-mutations 
Fix #5653: improve UserPermissions - password mutations
 2020-05-25 15:44:48 +02:00
Alexandre Bodin
02fcbf8f45 Update more configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:25:43 +02:00
Alexandre Bodin
fc6245b2d5 Migration guide for stable 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:25:43 +02:00
Jim LAURIE
fc4cef9926 fix: fix pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-05-22 10:34:38 +02:00
Jim LAURIE
16c304d710 Merge branch 'master' of github.com:strapi/strapi into jwtconfig 2020-05-22 10:22:14 +02:00
Pierre Noël
73849b8415 change emails in doc 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 19:33:55 +02:00
Pierre Noël
d8f1449e73 change config format 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 15:05:35 +02:00
Pierre Noël
83f847f359 change config format 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 18:11:24 +02:00
Pierre Noël
0fe0f34895 update email settings configuration 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 16:56:14 +02:00
Pierre Noël
471d9ef89c move email settings from db to files 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 16:56:14 +02:00
Jim LAURIE
7d958b0e97
Merge branch 'master' into docs/plugins-graphql 2020-05-14 10:32:48 +02:00
Alireza Kavian
603ffc1830
google provider section modified (#5730) 
The second "Client Id" should be: "Client Secret"
 2020-05-12 11:20:35 +02:00
ScottAgirs
d41227b75d Merge branch 'master' into patch---adjust-naming-to-password-mutations 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-07 13:05:29 -04:00
lpouvreau
9c90c7449e
Removed wrong extra double quote from plugins doc (#5981) 2020-05-05 19:40:24 +02:00
Robert Piosik
8675effa21 docs: add .js ext to graphql paths, fix code snip- 
et formatting

Signed-off-by: Robert Piosik <robertpiosik@gmail.com>
 2020-05-02 20:50:28 +02:00
Alexandre Bodin
da910b0b39 Fix create new project cli option for mongo not handled correctly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Fix typos

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Add tests for env helpers

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Typo

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:44 +02:00
Alexandre Bodin
2e31afe6dd Upgrade doc to use env var and js config files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
a877a00934 Update docuemntation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:41 +02:00
Jim LAURIE
f65644ba64
Merge branch 'master' into master 2020-04-27 11:29:14 +02:00
Jim LAURIE
8a1aefd28f Merge branch 'documentation' 2020-04-27 10:01:04 +02:00
Astraeus-
2dafb22b5e Update authentication error documentation 
Error has a "response" property that holds the data

Signed-off-by: Astraeus- <Astraeus-@users.noreply.github.com>
 2020-04-23 16:56:52 +02:00
Pierre Noël
4b7fbadef5
fix shadow crud breaking build when resolvers are not defined in a plugin (#5899) 
* fix shadow crud breaking build when resolvers are not defined in a plugin

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

* refacto

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

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-22 15:41:40 +02:00
Alexandre Bodin
c9cfc59566 Add a simple example of using env vars in provider config files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-21 14:58:02 +02:00
Jim LAURIE
05f24d93c0
Merge branch 'master' into docs/update_userperm_build 2020-04-20 16:03:15 +02:00
Alexandre Bodin
506811f198 Add some doc for maxFielSize 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-16 10:04:36 +02:00
Matt
b515adc6b8 Added some documentation about the JWT token configuration 
Signed-off-by: Matt <kapakapa197@gmail.com>
 2020-04-12 14:23:43 +02:00
ScottAgirs
823acf4777 [deprecate] change-password in favour of reset-password 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-04-11 13:41:09 -04:00
soupette
a51c97829b Fix docs typos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-10 15:51:35 +02:00
ScottAgirs
3a1b5dbe7d [add] documentation for password mutations 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
Derrick Mehaffy
4056f640a0
Add a link to build docs for custom providers 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-27 05:33:58 -07:00
soupette
818927f7b5 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-23 14:33:17 +01:00
Michael-Scott-PC
e56fa01c1c
Documentation improvements 2020-03-22 18:28:03 +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
Alexandre Bodin
ed2b973b99 Merge branch 'develop' into features/media-lib 2020-03-20 11:04:10 +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
Nikolay Tyurin
9bbb395e3a
Update graphql.md (#5510) 
changed link in the https://www.apollographql.com/
 2020-03-16 14:17:59 +01:00
soupette
bdc2758613 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-06 11:44:20 +01:00
Jim LAURIE
e718947657
Merge branch 'master' into docs/awsURLs 2020-03-05 15:37:01 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
Derrick Mehaffy
cc9d693f22
Add documentation reference for AWS SES URLs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-04 02:23:57 -07:00