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

46 Commits

Author SHA1 Message Date
Alexandre Bodin
755d216fbe Merge branch 'documentation' 2020-10-07 14:53:27 +02:00
Pierre Noël
a45d50aa58 use entries instead of values 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-06 11:49:51 +02:00
Ralph
b35b8f72b3
AWS Cognito provider (#6917) 
Add login provider AWS Cognito

Signed-off-by: ralphsomeday
 2020-10-06 11:45:22 +02:00
Alexandre Bodin
48b138e81c Merge branch 'master' into documentation 2020-10-06 11:06:24 +02:00
Convly
0951e45d12 Add publicationState argument for graphql queries 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-05 15:56:30 +02:00
Wes Bos
65308ae2cd
Provide docs on how to use the auth with graphql (#8154) 
* Provide docs on how to use the auth with graphql

* Update graphql.md
 2020-10-02 09:16:34 -07:00
Wes Bos
5afa8bbe44
Add docs for sorting graphql queries (#8155) 2020-10-02 17:35:51 +02:00
Alexandre Bodin
66e8579fc7 Merge branch 'master' into features/templates-cli 2020-10-02 15:21:16 +02:00
Mattias van den Belt
82ad488ea4
Update upload.md (#8045) 
Add popularity sorting parameter to provider list link.

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-09-28 11:25:52 +02:00
Rémi de Juvigny
3b0e02fe00 Autofix yarn.lock conflict 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-23 14:25:55 +02:00
Convly
a2578a2ab5 Merge branch 'master' into documentation 2020-09-16 15:33:46 +02:00
Rud Wangrungarun
9ca0743ed4
Edit understanding login flow to be more readable (#7858) 
* Edit `understanding login flow` to be more readable

- Edit steps 2 and 4 to make it more readable. The previous one is quite confusing when I read it.
- Edit assumption `Let's say...` to be more readable
- Change github to GitHub for consistency

Signed-off-by: Rud Wangrungarun <rudwna@gmail.com>

* Revert change in Understanding the login flow assumption

Signed-off-by: Rud Wangrungarun <rudwna@gmail.com>
 2020-09-15 09:56:51 +02:00
William Cheong Weelau
74ed5a2e2d
Update email.md (#7769) 
* Update email.md

to emphasize the part that developer need to pay attention to, especially the file name, and rewrite the part of the sentences on updating default sender email to make it works with the new email provider. Such that those who read this documentation could avoid hours of troubleshooting this configuration, (like what I had)

Signed-off-by: William Cheong Weelau <cheongweelau@gmail.com>

* Update email.md

Added the missing `:::` to close the newly added tip paragraph

Signed-off-by: William Cheong Weelau <cheongweelau@gmail.com>
 2020-09-14 09:32:44 +02:00
Jim LAURIE
b13ecc5da3
docs: update Roles & Permissions left menu mentions (#7796) 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-09-08 15:12:58 +02:00
Khalid Elshafie
3e23646f1b
Add LinkedIn auth provider (#7490) 
* Add LinkedIn auth provider

Signed-off-by: Khalid Elshafie <abolkog@gmail.com>
 2020-09-04 14:37:30 +02:00
Abdón Rodríguez Davila
d2ef1d4b8c
Allow more options to the Apollo Server config (#7665) 
* Extract server config to a constant

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Omit options to server config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Move default config to serverParams

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Simplify Apollo server config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Simplify with a new apolloServerConfig property

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update tracing documentation

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Extract deprecated options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add default options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update documentation

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Rename to deprecatedApolloServerConfig

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Empty default options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update default config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add warning note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add documentation note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update documentation note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Fix the config check

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Fix the config check

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Refactor old code and rename param to appoloServer to avoid redondancy

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

* Fix typo

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

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-09-04 09:51:11 +02:00
Jim LAURIE
cfcfea06c4 docs: remove tips in login provider tab causing templating issues 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-08-14 11:53:33 +02:00
Alexandre Bodin
acf11ed9b1 Merge branch 'documentation' 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-08-12 14:52:37 +02:00
JuanCarlosJr97
1afbdd663f
Updating email documentation adding a tip during initial setup to avoid issues during strapi creation (#7413) 
Signed-off-by: Juan Carlos Blanco Delgado <juancarlosjr97@gmail.com>
 2020-08-12 12:18:17 +02:00
Antonin Beaufort
f48892a0d7
[Docs] Email plugin : fix typo 
Signed-off-by: antoninbeaufort <33757018+AntoninBeaufort@users.noreply.github.com>
 2020-08-05 20:19:34 +02:00
Pierre Noël
77293268c6 Specify that only grant providers are supported 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:30 +02:00
Pierre Noël
b4afb8afcc move a tip 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:30 +02:00
Pierre Noël
6f369201a4 replace .fr by .com 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:29 +02:00
Pierre Noël
05cc400905 update grant + doc twitter 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:28 +02:00
Pierre Noël
75cb374f89 Update the provider loggin doc + display absolute redirect uri in front 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:28 +02:00
Alexandre Bodin
da338f92c4 Merge branch 'documentation' 2020-07-28 10:50:10 +02:00
Jim LAURIE
4c4a4c1dd3
Docs review (#6848) 
* docs: improve getting started

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* docs: review quickstart video and some steps

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* docs: review concepts

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* docs: review email - upload plugins

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* fix: PR feedback

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* fix: PR feedback type conflict

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-07-28 10:48:55 +02: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
Pierre Noël
4dc853a6e1 update doc + add localhost in confirmation links if url is not set 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-23 11:09:21 +02:00
Alexandre Bodin
6bafa35a36 Merge branch 'releases/3.1.0' into features/rbac 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-18 10:12:40 +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
Alexandre Bodin
b71ffa6c6c Merge branch 'master' into features/rbac 2020-07-16 14:52:55 +02:00
sgauthiertremblay
a86a8d54d4
Update email.md (#6997) 2020-07-16 11:12:56 +02:00
Riley Shea
ae73fdbebe
Update Purest docs link (#7028) 
Strapi uses purest 3.1 but docs were linking to an old 2.x branch of purest.
 2020-07-16 11:08:59 +02:00
Nusrath Khan
f496970cbf
fix: remove misleading documentation (#6927) 
removes misleading documentation around which fields on the USER model can be used in the email templates
 2020-07-15 18:04:57 +02:00
Pierre Noël
e000432027 add the possibility to edit the template for the forgot password email 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:41:18 +02:00
Jim LAURIE
cfa8719eac
Merge pull request #6724 from strapi/fix-docs-links 
Fix docs links 404
 2020-06-25 08:17:51 +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
Tudor Ilisoi
14212d9e79
scoped packages doc 
Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
 2020-06-21 16:56:22 +03: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
Pierre Noël
9f277f67b5
better error handling in email (#6599) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-06-09 12:11:25 +02:00
Jim LAURIE
f3c9ba08a3
Merge branch 'master' into patch-1 2020-06-02 15:08:23 +02:00
Tudor Ilisoi
3f675ddabe
fixed the spelling of 'Troubleshooting' 
Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
 2020-06-01 23:11:07 +03:00
Derrick Mehaffy
5907ff9a56
Typo fixes through the stable docs 2020-05-31 07:52:21 -07:00
Diego M. Rodríguez
970f079d31
Fix documentation at plugins/upload (#6376) 
Fix a couple of typos noticed in `plugins/upload.md` while reading the
documentation.

Signed-off-by: Diego M. Rodriguez <diego.plan9@gmail.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-05-28 13:54:39 +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