yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-23 15:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 127 Branches 496 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Virginie Ky
f9574aac62 refacto 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-11 22:53:27 +01:00
Virginie Ky
8ed0849432 delete multiple medias 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-11 22:50:02 +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
Jim LAURIE
6ef529b3a1 docs: rewrite sentence 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-10 17:01:44 +01:00
Virginie Ky
f0240a2c5e reset yarn.lock 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-10 16:54:54 +01:00
Virginie Ky
eb4287a91f reset yarn.lock 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-10 16:53:02 +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
Virginie Ky
03d290ba73 image crop and other files display 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-10 16:32:12 +01:00
Virginie Ky
b1e184833b Merge branch 'features/media-lib' of github.com:strapi/strapi into front/card-preview-integration 2020-03-10 14:31:00 +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
Virginie Ky
d00e806245 simplify handleSelectAll 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-10 11:37:13 +01:00
Virginie Ky
503df37fec Error state with icon and message ui 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-10 11:32:52 +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
Ky
a735697f99 clean reducer 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-10 01:27:59 +01:00
Ky
3189cc656a ListView Select and unselect all 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-10 01:24:49 +01:00
Ky
b1446ec82a clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-10 00:37:14 +01:00
Ky
762cb6bba6 generalize img card 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-10 00:27:18 +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