yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-18 22:45:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 115 Branches 484 Tags
Commit Graph

2029 Commits

Author SHA1 Message Date
Alexandre Bodin
2e31afe6dd Upgrade doc to use env var and js config files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
a877a00934 Update docuemntation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:41 +02:00
Alexandre Bodin
cbdc83d6d7 Move core middleware configs to the middleware concept doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:41 +02:00
Alexandre Bodin
eb706f2168 Init doc updates 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:40 +02:00
Ky
18cd135268 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-27 17:51:19 +02:00
cyril lopez
62c01a08e5
Merge branch 'master' into develop 2020-04-27 17:50:25 +02:00
Ky
0c1105a51a Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-27 15:50:05 +02:00
Jim LAURIE
07a69517c4
Merge pull request #5966 from strapi/docs/rfcs 
Add rfcs into the contribution docs
 2020-04-27 14:56:08 +02:00
Jim LAURIE
44dab28519
Merge branch 'master' into bugfix/aws-documentation-typo 2020-04-27 11:30:01 +02:00
Jim LAURIE
f65644ba64
Merge branch 'master' into master 2020-04-27 11:29:14 +02:00
Alexandre Bodin
05f22aaf27 Merge branch 'master' into develop 2020-04-27 11:15:48 +02:00
Jim LAURIE
a81d265edd
Merge pull request #5725 from adriatic/adriatic 
Update documentation from Content to Collection Type
 2020-04-27 10:59:41 +02:00
Jim LAURIE
22a2da3ae0 docs: add rfcs into the contribution docs 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-27 10:16:59 +02:00
Jim LAURIE
8a1aefd28f Merge branch 'documentation' 2020-04-27 10:01:04 +02:00
Ky
9384a00a96 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:13:20 +02:00
soupette
5a41f68f2b Merge branch 'master' of github.com:strapi/strapi into develop 2020-04-24 15:34:45 +02:00
Daniel Schäfer
0e8dc2e917
Fix typo in documentation (#5866) 
Signed-off-by: Daniel <epegzz@gmail.com>
 2020-04-24 14:08:01 +02:00
soupette
03b7b3340f Improve doc 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 12:46:37 +02:00
soupette
8f22ee2c5a Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 12:07:07 +02:00
Brian Dixon
0f8d150105 Fix Typo in AWS deployment documentation 
Following the instructions to install Node.js with npm will result in node version 10 being installed instead of version 12.

Signed-off-by: bjdixon <bjdixon@gmail.com>
 2020-04-24 13:51:27 +08:00
Astraeus-
2dafb22b5e Update authentication error documentation 
Error has a "response" property that holds the data

Signed-off-by: Astraeus- <Astraeus-@users.noreply.github.com>
 2020-04-23 16:56:52 +02:00
soupette
221ad7975b Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:51:42 +02:00
Pierre Noël
4b7fbadef5
fix shadow crud breaking build when resolvers are not defined in a plugin (#5899) 
* fix shadow crud breaking build when resolvers are not defined in a plugin

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-22 15:41:40 +02:00
soupette
ec5f4e2e96 Update documentation about language customisation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:09 +02:00
soupette
cf3690d41c Update documentation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:06 +02:00
Alexandre Bodin
c9cfc59566 Add a simple example of using env vars in provider config files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-21 14:58:02 +02:00
Derrick Mehaffy
c91cb18d2b
Comment out bad links and fix read me, add link to update guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-20 22:58:14 -07:00
Jim LAURIE
05f24d93c0
Merge branch 'master' into docs/update_userperm_build 2020-04-20 16:03:15 +02:00
Jim LAURIE
f22c595e49
Merge branch 'master' into docs/clean_local_plugin 2020-04-20 16:01:28 +02:00
Jim LAURIE
42e88b6723 Merge branch 'master' of https://github.com/strapi/strapi into documentation 2020-04-20 15:37:08 +02:00
Jim LAURIE
c4f02be4f3 docs: remove options from the model documentation 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-20 15:26:45 +02:00
Derrick Mehaffy
a44d583828
Remove Stack Overflow and Spectrum from project and use GH Discussions 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-20 04:05:27 -07:00
Alexandre BODIN
9f9eea03f0
Merge pull request #5778 from strapi/docs-upload-service 
Fix upload models name definition
 2020-04-20 09:32:32 +02:00
Jim LAURIE
88402aed1f docs: fix pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-18 10:17:37 +02:00
Jim LAURIE
bd4b831ec3
Merge pull request #5829 from strapi/models-global-id-warning 
Add warning about changing models globalId
 2020-04-17 20:02:53 +02:00
Pierre Burgy
ef457cf93f
Fix documentation typos (#5856) 
Signed-off-by: Pierre Burgy <pierre.burgy@gmail.com>
 2020-04-17 17:09:45 +02:00
Tony Toth
2b4301ad9c
Update migration-guide-beta.19-to-beta.19.4.md (#5827) 2020-04-17 16:48:31 +02:00
Derrick Mehaffy
227388ac62
Add note that migration script for beta.19 to beta.20 is only for Mongo 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-17 02:38:44 -07:00
Derrick Mehaffy
2e48e54f54
Re-add Google App Engine deployment docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-17 01:46:04 -07:00
Convly
183ef9f6ee Add warning about consequences of renaming models.settings.json files & globalId 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-04-16 17:02:26 +02:00
Alexandre Bodin
506811f198 Add some doc for maxFielSize 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-16 10:04:36 +02:00
soupette
3a0219033f Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-04-15 17:30:49 +02:00
Alexandre Bodin
d4058b25aa Fix typos 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-15 17:07:19 +02:00
soupette
62148daf7a Add documentation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-15 13:03:21 +02:00
Derrick Mehaffy
a4423f2fda
PR feedback 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-15 02:26:53 -07:00
Alexandre Bodin
3620c0de7d Remove unwanted file 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-15 11:26:23 +02:00
Derrick Mehaffy
3ebd497454
fix formatting to match previous block 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-15 02:24:25 -07:00
Derrick Mehaffy
3a831dc36c
Remove invalid plugin development tip, and revert structure comment 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-15 02:24:25 -07:00
Alexandre Bodin
38c54fb206 Fix typo in migration guide 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-15 10:24:17 +02:00
Alexandre Bodin
4f3c4ab340 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-15 10:23:46 +02:00