yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 12:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,511 Commits 115 Branches 486 Tags
Commit Graph

742 Commits

Author SHA1 Message Date
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
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
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
5b3c89809c
Merge branch 'master' into patch-1 2020-06-05 14:41:54 +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
Tudor Ilisoi
03a0422699
fixed spelling 
Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
 2020-06-01 23:13:13 +03:00
Giovanni Giordano
fb5c17c227 Fix links in deployment page 
Signed-off-by: Giovanni Giordano <giordano.giovanni1993@gmail.com>
 2020-05-29 09:35:06 +02: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
bdf47753b2 Add one change in migration guide 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:47:28 +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
7df82f5e62 Add cleanup instruction 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:27:33 +02:00
Alexandre Bodin
9078081eba Add strucutre example 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:25:43 +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
Alexandre BODIN
b4f168963d
Merge pull request #6226 from caiojhonny/patch-1 
documentaiton typo
 2020-05-25 14:57:36 +02:00
Alexandre BODIN
efe40dc3ac
Merge pull request #6313 from epegzz/patch-2 
Fix typo
 2020-05-25 14:56:45 +02:00
Caio Jhonny
a3ee191d5a
Merge branch 'master' into patch-1 2020-05-22 12:49:20 +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
Daniel Schäfer
3f0a67234d
Fix typo 2020-05-21 19:56:22 +02:00
Caio Jhonny
6467384d0d Add missing comma 
Signed-off-by: Caio Jhonny <caiojhonnyp@gmail.com>
 2020-05-20 10:18:10 +02:00
Alexandre Bodin
1ab5afc33d Merge branch 'develop' 2020-05-18 09:55:53 +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
Derrick Mehaffy
3e2b2898f3
Update GCP host in beta docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 11:47:30 -07: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
Derrick Mehaffy
f80021eb9f
Add note about CLI migration feature coming in stable. 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 08:14:17 -07:00
Derrick Mehaffy
58295534a3
Update FAQ for Beta Docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 08:11:02 -07:00
Derrick Mehaffy
0838b24f5f
Fix path and minor fix to azure desc 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 08:00:00 -07:00
Derrick Mehaffy
fbc6253d44
Temporary menu until a proper SVG can be added 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 08:00:00 -07:00
Derrick Mehaffy
f347394dfc
finish config examples for HAProxy 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:58:55 -07:00
Derrick Mehaffy
7f59027ae0
Initialize HAProxy proxying guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:58:55 -07: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
Derrick Mehaffy
a599a8bad8
fix paths to match standards 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:45:13 -07:00
Derrick Mehaffy
46f04c2bdf
Add Caddy logo (Thanks to <matthew.holt@gmail.com> ) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:44:19 -07:00
Derrick Mehaffy
61e7d61af0
adjust some wording and add Caddy menu item (no icon) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:44:19 -07:00
Derrick Mehaffy
eb0aad0a1d
Initialize Caddy proxy documentation 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:44:19 -07:00
Derrick Mehaffy
df59a6b5a5
PR Feedback - fix path 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:41:20 -07:00
Derrick Mehaffy
1c0cc8b25f
Update Nginx proxy docs for new proxy changes 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:41:05 -07:00
Jim LAURIE
bdb4664d29
Merge branch 'master' into patch-1 2020-05-14 16:02:48 +02:00
Jim LAURIE
a8479c3dd7
Merge branch 'master' into patch-1 2020-05-14 11:13:41 +02:00
Jim LAURIE
9da58872ec
Merge branch 'master' into patch-1 2020-05-14 11:11:19 +02:00
Alexandre Bodin
ec0a573cef Merge branch 'master' into develop 2020-05-14 10:45:45 +02:00
Jim LAURIE
7d958b0e97
Merge branch 'master' into docs/plugins-graphql 2020-05-14 10:32:48 +02:00
Jim LAURIE
4c7746d3e1
Merge branch 'master' into patch-1 2020-05-14 10:30:30 +02:00
Jim LAURIE
0bd9832ad0
Merge branch 'master' into docs/fixLinks 2020-05-14 10:16:00 +02:00
Alexandre Bodin
773d6ef44f Merge branch 'master' into develop 2020-05-13 17:13:06 +02:00