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
11,876 Commits 129 Branches 498 Tags
Commit Graph

11876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
875432cc33
Merge pull request #5493 from strapi/docs/do-one-click 
Update DigitalOcean one-click docs for recent changes
 2020-03-13 14:32:46 +01:00
Jim LAURIE
dcb7be51d1
Merge branch 'master' into docs/do-one-click 2020-03-13 14:32:26 +01:00
Pierre Noël
1227bfeba4 add possibility to set a relation "private" 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-13 12:23:11 +01:00
Pierre Noël
65a3e83ee3 Change error message when bookshelf db connection fails at start 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-13 12:20:06 +01:00
Derrick Mehaffy
7f87d86d6d
Update DO Docs per https://github.com/strapi/one-click-deploy/pull/6 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-13 02:53:29 -07:00
Alexandre BODIN
310fc3d0cd
Merge pull request #5452 from strapi/fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 
Fix find one cant have multiple parameters when there is a primary key
 2020-03-13 09:42:22 +01:00
cyril lopez
eb9a4d6809
Merge pull request #5488 from strapi/fix/dz 
Fix dynamic zone reorder input file and date updates
 2020-03-12 17:44:52 +01:00
cyril lopez
cba1d69694
Merge branch 'master' into fix/dz 2020-03-12 17:04:46 +01:00
Alexandre BODIN
9ab43d2c42
Merge branch 'master' into fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 2020-03-12 16:10:56 +01:00
soupette
0b5ba26b4d Add package.json to copied files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
soupette
a46590feda Add infos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
soupette
e47b451f7c Require version from package.json instead of using the data from the back-end 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
Jozef Cipa
e8c4629779
Fix/admin path serve (#5287) 
* Add config option to disable serving admin assets

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>

* Add serveAdminPanel option to docs

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>

* Inherit default value for serving admin from config

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>
 2020-03-12 09:39:25 +01:00
Brad Christie
b2d19c8ad8
Add --no-run and --use-npm (#5420) 
Not sure if you want to call-out that it will leverage yarn if/when possible (if npm flag is not set).

Did notice other APIs need an update, but unsure how `---tpl` relates to new cli. I assume it's been refactored into `--extend`, but unsure.

Signed-off-by: Brad Christie <bch@sitecore.net>
 2020-03-12 09:34:01 +01:00
Alexandre BODIN
a13b7b0d5a
Merge pull request #5426 from nazrdogan/patch-1 
fix typo
 2020-03-12 09:33:12 +01:00
Alexandre BODIN
1a86d4395e
Merge pull request #5407 from ScottAgirs/patch-1 
Minor typo fixes
 2020-03-12 09:31:44 +01:00
Alexandre BODIN
78735792d7
Merge pull request #5486 from fodkastir/master 
fix #5399 Strapi is not using the configured host when launching the server
 2020-03-11 17:07:40 +01:00
soupette
ec47ad9b92 Remove 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-10 17:54:11 +01:00
soupette
d0841bc8b7 Remove useless ct 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-10 17:53:44 +01:00
Yen
222903baab use host value defined in config when launching server 
Signed-off-by: Yen <fodkastir@gmail.com>
 2020-03-10 11:01:56 -05:00
Jim LAURIE
6ef529b3a1 docs: rewrite sentence 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-10 17:01:44 +01:00
Jim LAURIE
11aeae4dc7 docs: add single type examples 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-10 16:47:41 +01:00
Pierre Noël
15f4ae67d7 add test for replaceIdByPrimaryKey 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-10 16:44:28 +01:00
soupette
82baebe930 Update buffet 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-10 14:01:44 +01:00
Alexandre BODIN
204044d250
Merge branch 'master' into fix/#4881/cantDisableOrOverrideRootPage 2020-03-10 12:13:55 +01:00
soupette
28c57d8af4 Temporarily fix input file until media lib is ok 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-10 11:50:48 +01:00
soupette
819a403340 Created temp input file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-10 10:25:24 +01:00
Pierre Noël
53d38433b5 set /public defer to false 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-10 09:36:04 +01:00
Pierre Noël
18a8b410c6 Typo 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-09 17:36:10 +01:00
Pierre Noël
a1774db410 return null instead of promise 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-09 17:22:36 +01:00
Pierre Noël
773a6525d4 little refacto of loading config + add doc 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-09 17:04:15 +01:00
Pierre Noël
74e63ea77c Move index.html to public middleware + add config var "defaultIndex" 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-09 15:48:42 +01:00
Jim LAURIE
44b1b302bc
Merge pull request #5298 from strapi/docs/one-click 
Add DigitalOcean one-click docs
 2020-03-09 14:59:53 +01:00
Jim LAURIE
41695b3113
Merge branch 'master' into docs/one-click 2020-03-09 14:57:44 +01:00
Jim LAURIE
cd1a2112c0
Merge pull request #5476 from strapi/docs/add-settings-api 
Add front-end settings API to documentation
 2020-03-09 14:51:26 +01:00
Pierre Noël
b5f9795dbc small refacto of findOne + fix deleteMany of connector-mongoose 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-09 12:09:43 +01:00
soupette
5ed5912ef0 Add front-end settings api to documentation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-09 10:52:27 +01:00
Alexandre BODIN
4b93599134
Merge pull request #5447 from strapi/docs-guide-count-graphql 
Add count GraphQL guide
 2020-03-09 09:08:29 +01:00
Alexandre BODIN
69c7021063
Merge branch 'master' into docs-guide-count-graphql 2020-03-09 09:08:20 +01:00
Derrick Mehaffy
0e5955e570
PR fixes - remove extra link 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:31 -07:00
Derrick Mehaffy
5aef99c337
Move docs to installation area per Jim and change referral link 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Derrick Mehaffy
ad8e82553f
simplify documentation for now 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Derrick Mehaffy
d1836862d5
still wip 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Derrick Mehaffy
5f570c8cb6
setting up production migration structure 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Derrick Mehaffy
5f0e04aa29
more DO docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Derrick Mehaffy
8ae3cd9b50
Adding initial DO docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Alexandre Bodin
a70991a37e Update yarn.lock 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-08 22:25:13 +01:00
ScottAgirs
ac1364239a Merge branch 'patch-1' of https://github.com/ScottAgirs/strapi into patch-1 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-07 13:08:45 -05:00
Scott Agirs
c56c3a0aae
Merge branch 'master' into patch-1 2020-03-07 13:06:30 -05:00
Derrick Mehaffy
9ab7144b18
PR Feedback 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-06 11:24:33 -07:00