yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 18:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 116 Branches 488 Tags
Commit Graph

239 Commits

Author SHA1 Message Date
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
Joris W
e1a09aba61
Update Dynamic Zone description 2020-07-17 18:10:34 +02:00
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
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
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
Sebastian Kondraciuk
235e330f65
fix a minor typo (#6937) 
Signed-off-by: Naylepsh <naylepsh@gmail.com>
 2020-07-16 11:22:16 +02:00
sgauthiertremblay
a86a8d54d4
Update email.md (#6997) 2020-07-16 11:12:56 +02:00
Riley Shea
823bb6fdb1
typo fix for below text link (#7001) 2020-07-16 11:12:06 +02:00
Diego Albitres
1f55ec89e9
docs: fix 404 link on services.md (#7019) 
Signed-off-by: Diego Albitres <diego.albitres@gmail.com>
 2020-07-16 11:10:56 +02:00
Ryan Pitts
fccb396c04
typo in is-ownder.md (#7006) 
fix grammatical error in delete action tip
 2020-07-16 11:10:04 +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
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
Joris W
3ced95b611
Update models.md 2020-07-07 10:41:30 +02:00
Joris W
77cf549c07
Update models.md 2020-07-07 10:40:33 +02:00
Joris W
2d0ebc99c4
Update models.md 
Clarified intro paragraph to better describe what Dynamic Zones do
 2020-07-07 10:38:04 +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
Jim LAURIE
8fe827c484 docs: fix 404 link DO 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-06-25 08:22:29 +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
Alexandre BODIN
a79e90004c
Merge pull request #6753 from tudorilisoi/scoped_providers 
scoped packages doc
 2020-06-24 10:22:30 +02:00
Jim LAURIE
52f493a798 docs: fix #6776 link version docs 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-06-23 13:51:48 +02:00
Tudor Ilisoi
14212d9e79
scoped packages doc 
Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
 2020-06-21 16:56:22 +03:00
Alexandre Bodin
081b893b48 Merge branch 'master' into documentation 2020-06-18 19:19:25 +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
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
DMehaffy
95ac901a29
Remove outdated docs for stable admin customization (#6636) 
* Remove outdated docs for stable admin customization

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

* Fix typo

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-06-15 17:42:51 +02:00
Alexandre Bodin
93fa0c7b77 Merge branch 'master' into documentation 2020-06-15 17:15:07 +02:00
Dan Bryant
392bc2822f
Fixed misspelled word (#6621) 2020-06-15 14:35:41 +02:00
Yussuf Elarif
640a6c820e
Fixed Typo on v3.x (#6635) 
* Fixed Typo on v3.x

Changed from "if" to "it"

* Fixed typo on 3.0.0-beta.x

Changed from "if" to "it"

* removed 's' from looks v3.x

* removed 's' from looks v3.0.0-beta.x
 2020-06-15 14:35:05 +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
Diego Guerra
d4186cdbec
fix: misspelled lifecycle hook in documentation (#6679) 2020-06-15 14:32:10 +02:00
DMehaffy
68e8a460f0
Clean up the stable migration guide based on community feedback (#6633) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-06-15 14:16:41 +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