yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-14 12:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 119 Branches 483 Tags
Commit Graph

2029 Commits

Author SHA1 Message Date
Alexandre BODIN
cba02febf2
Upgrade api token tuto to not break rbac feature (#7250) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 17:41:02 +02:00
Sebastian Campos
c3f4afca87
Docs/parameters typos (#7238) 
* fix 'complexE' typos

* fix 'complexE' typos

Co-authored-by: scampos <sebastian@synergiar.com>
 2020-07-29 17:39:28 +02:00
Alexandre Bodin
8a702bc6e8 Merge branch 'master' into documentation 2020-07-29 13:36:37 +02:00
Jim LAURIE
4994ca26fd
Merge pull request #7235 from jakesyl/patch-1 
fix grammar issue
 2020-07-29 11:28:32 +02:00
Jim LAURIE
9ca1bc9962
Merge pull request #6923 from jorisw/patch-1 
Update models.md
 2020-07-29 11:22:03 +02:00
Azri Kahar
56e442637f
Update docker-compose examples (#6566) 
* Change volume for strapi in SQLite for consistency

Changed volume bind mount from `./:/srv/app` to `./app:/srv/app` to match path used in PostgreSQL and MongoDB example

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Remove "links" option for PostgreSQL & MongoDB

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Add "depends_on" option for PostgreSQL & MongoDB

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Changed volume for strapi in MongoDB example

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Add database init name environment variables

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Remove exposed ports for databases

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Update docker.md

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-29 09:40:26 +02:00
Jake Sylvestre
79fc341d11 fix grammar issue 
Signed-off-by: Jake Sylvestre <jakesyl@gmail.com>
 2020-07-28 14:08:45 -04:00
DMehaffy
6641f4e43f
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com> (#6947) 2020-07-28 09:50:10 -07: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
Eli
528dc4140e
Fix typos with the module.exports functions. (#7070) 
The `module.exports` example code is missing a closing parenthesis at the end of each example. Added the closing parenthesis.
 2020-07-25 08:46:16 +02:00
Alexandre BODIN
3d1cb2ca4d
Merge pull request #7130 from ByungJun25/documentation 
Update draft.md
 2020-07-25 08:43:19 +02:00
MattieBelt
7627dba96a Add extension warning 
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-07-24 09:40:35 +02:00
Alexandre BODIN
ce769d7474
Add migration warning (#7143) 
* Add migration warning

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

* minor tweak to grammer

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

Co-authored-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-07-23 09:25:35 -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
Pierre Noël
7465b74d25 fix typo + remove comment 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-23 11:09:41 +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
Byungjun Woo
6a2ec56b2d
Update draft.md 
fixed wrong path on 'Apply our changes'
 2020-07-23 11:00:25 +02:00
DMehaffy
a58cd8f17b
Fixing service documentation and fixing DO referral link (#7101) 
* Fix service docs for upload plugin

https://github.com/strapi/strapi/discussions/7090

* Change DO referral links
 2020-07-22 14:23:54 +02:00
Alexandre Bodin
0c4c955980 Add note in doc about the version for OR and AND operators 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-22 08:10:04 +02:00
Alexandre Bodin
62b2192c95 Update license info 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-20 18:40:52 +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
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
Nazır Doğan
3fbf9902d5
Update parameters.md (#6987) 2020-07-16 11:13:36 +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
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
Joris W
3ced95b611
Update models.md 2020-07-07 10:41:30 +02:00