yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 08:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,971 Commits 129 Branches 498 Tags
Commit Graph

1381 Commits

Author SHA1 Message Date
Alexandre Bodin
e68f8d0e83 Add _where parameter OR and AND doc v1 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-16 18:50:38 +02:00
Alexandre Bodin
b71ffa6c6c Merge branch 'master' into features/rbac 2020-07-16 14:52:55 +02:00
Emmanuel Mahuni
9a6de2a562
Update migration-guide-beta.20-to-3.0.0.md (#6750) 
I did everything but noticed that the documentation isn't clear about hooks. I literally moved contents of the hook.json file to a new file hook.js without the settings key and nothing worked until I moved into settings key as specified in the hooks section.
 2020-07-16 14:02:50 +02:00
Pierre Noël
2108c0c342 better explain how to generate jwt token 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 12:58:15 +02:00
Pierre Noël
3c5ae17d09 fix typos + add tip to generate a JWT token 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 12:58:15 +02:00
Pierre Noël
066221f5b8 init migration guide to 3.1.x 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 12:58:14 +02:00
Nikolaj Ivancic
b2d4fbfb12
Update configurations.md (#6731) 2020-07-16 12:48:05 +02:00
Gil Fewster
5145148da1
Fixes: broken link to deployment page (#6934) 
Signed-off-by: Gil Fewster <hello@gilfewster.com>
 2020-07-16 11:24:32 +02:00
umutbozdag
1d5e3947f0
#6954 Possible mistake about database file name in the docs (version … (#6957) 
* #6954 Possible mistake about database file name in the docs (version 3.x)

* Update docs/v3.x/guides/databases.md

Co-authored-by: Mattias van den Belt <mattiasvandenbelt@gmail.com>

Co-authored-by: Mattias van den Belt <mattiasvandenbelt@gmail.com>
 2020-07-16 11:23:13 +02:00
Nazır Doğan
3fbf9902d5
Update parameters.md (#6987) 2020-07-16 11:13:36 +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
Peter Baričič
36ab6144cb
Add ENV to allow hiding startup message (#6348) 
* Add ENV to allow hiding startup message

Signed-off-by: Peter Baričič <pbaricic@gmail.com>

* Rename ENV

Signed-off-by: Peter Baričič <peter.baricic@naytrolabs.com>

* Revert the logic

Signed-off-by: Peter Baričič <pbaricic@gmail.com>

* Update docs with startup ENVs

Signed-off-by: Peter Baričič <pbaricic@gmail.com>

Co-authored-by: Peter Baričič <peter.baricic@naytrolabs.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-16 09:01:08 +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
Kim, Harim
f3e078caf6
Add logic to change file name to migration script, add additional description of file name (#6793) 
Signed-off-by: harimkims <harimkims@gmail.com>
 2020-07-09 16:32:05 +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
soupette
a4d99ba742 Add permissions to settings menu 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:47 +02:00
soupette
bcb18f117f Update doc 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:06 +02:00
soupette
e73101b664 Update doc 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:04 +02:00
soupette
904eb3ab7a Update settings api and documentation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:04:26 +02:00
Pierre Noël
ef8f918937 update doc + remove broken button in index.html 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-06-29 09:44:06 +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
ghoshSomoto
6774667c65
Security middlewares csp option added (#6694) 
Added missing explanation on how to set the "Content-Security-Policy"(csp) header value

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-06-16 14:02:06 +02:00
Robin Gagnon
ce27609516
Fix typo in model relations docs (#6539) 
Signed-off-by: Robin Gagnon <me@reobin.dev>
 2020-06-15 14:37:57 +02:00
Dan Bryant
392bc2822f
Fixed misspelled word (#6621) 2020-06-15 14:35:41 +02:00
Nikolaj Ivancic
d0a83268f0
Very slight improvement of the webhook definition (#6652) 2020-06-15 14:34:08 +02:00
nikitasol
cd955786bd
Should be port 5432 (#6662) 2020-06-15 14:32:43 +02:00
DMehaffy
a2e3b4a5e5
Load image from file to fix the caddy logo (#6494) 2020-06-15 14:14:09 +02:00
Simon
3e118da147
Update slug system to new lifecycle hooks (#6572) 2020-06-15 10:39:50 +02:00
bazzou789
88bc05f2dc
Modified admin.path to admin.url (#6601) 2020-06-15 10:39:05 +02:00
Akash Gupta
f419e326d9
Typo mistake (#6657) 2020-06-15 10:08:54 +02:00
François Vaux
273c883eed
docs: Fix a few typos in the 3rd party client guide (#6656) 2020-06-15 09:58:49 +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
Adam Gall
dc1d29aae2
Update configurations.md in both sets of docs (#6563) 
You can not check that the database is up and running in the bootstrap function, as it is executed after the database connection is initialized

Signed-off-by: Adam Gall <adam@decentlabs.io>
 2020-06-08 10:00:37 +02:00
Jim LAURIE
b555c898ba
Merge branch 'master' into patch-1 2020-06-05 15:07:30 +02:00
Jim LAURIE
5b3c89809c
Merge branch 'master' into patch-1 2020-06-05 14:41:54 +02:00
Jim LAURIE
de9109db9b
Merge branch 'master' into feature/guide-unit-testing-v3 2020-06-05 14:33:51 +02:00
Jim LAURIE
a94dffa4bb
Merge branch 'master' into docs/google-app-engine 2020-06-05 14:09:29 +02:00
Jim LAURIE
33d16cf772
Merge branch 'master' into feature/slugify-options 2020-06-05 13:57:49 +02:00
Jim LAURIE
ede5a72e71
Fix list guide lines 2020-06-05 13:57:09 +02:00
Rodrigo José Carvalho de Mello
026b91a99b
Update slug.md 2020-06-02 20:49:26 -03:00
Rasmus Nørskov
53822482a7 Charged documentation format 
Signed-off-by: Rasmus Nørskov <rasmus@norskov.org>
 2020-06-02 17:46:00 +02:00
Vanessa Pasque (Lith)
2b6ff54dbe Update documentation of the section plugin Google Cloud Storage 
Signed-off-by: Vanessa Pasque (Lith) <lith@amykron.com>
 2020-06-02 16:50:36 +02:00
Jim LAURIE
f3c9ba08a3
Merge branch 'master' into patch-1 2020-06-02 15:08:23 +02:00
Jim LAURIE
b17f473902
Merge branch 'master' into docs/faqUpdateStable 2020-06-02 15:06:08 +02:00
Mateusz Qunabu
4ed23afc52
Apply suggestions from code review 
Tab ends wrong place
 2020-06-02 14:56:06 +02:00
Tudor Ilisoi
03a0422699
fixed spelling 
Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
 2020-06-01 23:13:13 +03: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
Alexandre BODIN
0d4d8ff1a4
Merge branch 'master' into docs/stable/typoFixes 2020-06-01 10:39:46 +02:00
Diogo Correia
714a88a4e8
Fix typo in migration guide to stable (#6451) 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-06-01 10:36:06 +02:00
Derrick Mehaffy
2e04f1a8c8
Add note from Aurelien and fix regression from beta docs 2020-06-01 01:35:57 -07:00