yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,027 Commits 121 Branches 507 Tags
Commit Graph

12027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
f99f83af02 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-13 11:04:45 +01:00
cyril lopez
b24a548c0f
Merge pull request #5500 from strapi/features/media-lib-ctb-option 
Media lib add allowed types to [CTB]
 2020-03-13 10:46:20 +01:00
soupette
4ab399af48 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-13 10:28:57 +01: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
soupette
2fcc71f21c Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-ctb-option 2020-03-12 17:46:05 +01:00
soupette
23cdc180b9 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-12 17:45:42 +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
soupette
bbc13eb27a Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 17:41:27 +01:00
cyril lopez
cba1d69694
Merge branch 'master' into fix/dz 2020-03-12 17:04:46 +01:00
soupette
82cde9a194 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-ctb-option 2020-03-12 16:44:49 +01:00
soupette
083e18ec52 Add allowed types to ctb 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 16:44:36 +01:00
Alexandre BODIN
9ab43d2c42
Merge branch 'master' into fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 2020-03-12 16:10:56 +01:00
Alexandre BODIN
9ffd037a3a
Merge pull request #5497 from strapi/media-lib/feedbacks 
Media lib Spec changes
 2020-03-12 15:14:20 +01:00
Alexandre Bodin
eb76a07daf Update media-lib features according to spec changes 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-12 14:25:50 +01:00
Alexandre Bodin
c4bf0cdb67 Add allowedTypes in media type meta 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-12 09:44:04 +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
32c021db37 Remove allowedType all option 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-12 09:29:01 +01:00
Alexandre BODIN
f2d92e72fc
Merge pull request #5487 from strapi/media-lib/refactoring 
Media lib/refactoring
 2020-03-12 09:28:23 +01:00
soupette
485faf352f Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:21:18 +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
Alexandre Bodin
02d042769f Remove file sha that was not standard 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-10 17:26:15 +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
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
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
Alexandre Bodin
2b5c332e09 Clean up 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-09 22:11:56 +01:00
Alexandre BODIN
f9d924dd47
Merge pull request #5473 from strapi/media-lib/responsive-dimensions 
Add responsive formats to the upload plugin
 2020-03-09 22:11:27 +01:00
Alexandre Bodin
571e829b7a Fix typos 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-09 21:52:23 +01:00
Alexandre Bodin
939c8354c0 Create file formatters 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-09 21:52:23 +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
Alexandre BODIN
c183abcce4
Merge pull request #5472 from strapi/media-lib/optimization 
Media lib/optimization
 2020-03-09 16:29:28 +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
Alexandre BODIN
88400557ce
Merge pull request #5449 from strapi/media-lib/thumbnail 
Media lib/thumbnail
 2020-03-09 13:52:20 +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
Alexandre Bodin
2d12f88394 Optimize file 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-09 09:05:43 +01:00
Alexandre Bodin
e0b1c1181e Change upload bootsrap comment 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-09 09:05:42 +01:00