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

11423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
9c638f5351 Fixes #5053 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 11:20:04 +01:00
ELABBASSI Hicham
721ec829ae
Merge pull request #5327 from strapi/admin/update-buffetjs 
Update Buffet.js dependency
 2020-02-26 14:49:13 +01:00
virginieky
db69b50662
Merge branch 'develop' into admin/update-buffetjs 2020-02-26 14:31:16 +01:00
Alexandre Bodin
2a0becb9b0 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-26 10:12:25 +01:00
Alexandre BODIN
53061dad7c
Merge pull request #5242 from 7mioda/strap-plugin-upload-file-size-comparaison-issue#5233 
fix(plugin-upload): size limit comparison issue
 2020-02-26 10:08:16 +01:00
Alexandre BODIN
e06e8ee2fd
Merge branch 'master' into strap-plugin-upload-file-size-comparaison-issue#5233 2020-02-26 09:47:22 +01:00
Alexandre Bodin
3e0fa37669 Update yarn lockfile 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-26 09:46:54 +01:00
Alexandre BODIN
5c3420a0fc
Merge pull request #5308 from strapi/docs/requests 
Added information about body and files to request docs
 2020-02-26 09:42:40 +01:00
soupette
23710b5fc2 Update Buffet.js so we can test the single types feature 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-26 08:05:37 +01:00
Edaly Ahmed
899ecb32a5 Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr> 
removing unecessary cast
 2020-02-25 20:11:53 +01:00
Edaly Ahmed
129edd66ee Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr> 
adding getConfig service and casting params before updating database
 2020-02-24 17:51:39 +01:00
Derrick Mehaffy
a5a48d8348
Added information about body and files to request docs 
These paths to body and files differ from Koa's typical pathing, adding them to the docs temporarily until the docs are reworked.
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-02-24 08:34:04 -07:00
Alexandre Bodin
bd53103e06 Merge branch 'master' into develop 2020-02-21 11:56:59 +01:00
Alexandre BODIN
c05dcec622
Merge pull request #5273 from strapi/docs-self-data 
Add guide for isOwner policy
 2020-02-20 21:22:28 +01:00
Alexandre BODIN
adc714c9c6
Merge branch 'master' into docs-self-data 2020-02-20 21:21:51 +01:00
Jim LAURIE
f6de4c8213 docs: update is owner pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-20 19:06:40 +01:00
virginieky
dccff09c91
Merge pull request #5252 from Tomburgs/patch-1 
Fix hardcoded styles
 2020-02-20 17:36:24 +01:00
Jim LAURIE
25e77a9bd1 docs: add tip is owner delete 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-20 16:23:07 +01:00
Toms Burgmanis
31a9e88a4d
Merge branch 'master' into patch-1 2020-02-20 16:10:53 +02:00
Alexandre BODIN
3298cb4690
Merge branch 'master' into docs-self-data 2020-02-20 12:02:03 +01:00
Alexandre BODIN
38da84e5b9
Merge pull request #5276 from strapi/template-pr 
Delete labels from the PR body
 2020-02-20 11:37:08 +01:00
Jim LAURIE
d3e05d80fc enhancement: update pr temaplate 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-19 22:38:58 +01:00
Jim LAURIE
ff466efb61 docs(guide): add guide for isOwner policy 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-19 17:08:16 +01:00
Alexandre Bodin
614d550742 Merge branch 'master' into develop 2020-02-19 15:04:09 +01:00
cyril lopez
1e630a03ca
Merge pull request #5262 from strapi/fix/#5260 
Fixes WYISIWYG update when used in a dynamic zone
 2020-02-19 05:49:36 +01:00
Toms Burgmanis
26d6687940
Merge branch 'master' into patch-1 2020-02-19 01:41:06 +02:00
Jim LAURIE
063caa5bbc
Merge pull request #5251 from vitaliytv/patch-1 
Update RU translations
 2020-02-18 16:36:11 +01:00
Jim LAURIE
a28eadf67f
Merge branch 'master' into patch-1 2020-02-18 16:35:59 +01:00
Toms Burgmanis
430505b032
Merge branch 'master' into patch-1 2020-02-18 17:22:23 +02:00
soupette
6d384ddb6a Fixes #5260 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-18 14:31:28 +01:00
Alexandre BODIN
5164da2191
Merge pull request #5235 from jeremh2/admin-watcher-improvement 
chore(admin): Improve admin file watcher
 2020-02-18 11:01:45 +01:00
Alexandre BODIN
92de9e56dd
Merge branch 'master' into admin-watcher-improvement 2020-02-18 11:01:10 +01:00
virginieky
f25caacb1e
Merge branch 'master' into patch-1 2020-02-17 10:20:04 +01:00
soupette
e4c485da81 Merge branch 'master' of github.com:strapi/strapi into develop 2020-02-17 08:04:08 +01:00
cyril lopez
ffe2d80e4c
Merge pull request #5229 from okandas/center-plugin-icons 
enhancement(Row\Content.js): align plugin icons to the center
 2020-02-17 08:03:40 +01:00
Toms Burgmanis
b55ce1949e Fixed incorrect variable being used for left-hand side menu 
Signed-off-by: Toms Burgmanis <toms.burgmanis@gmail.com>
 2020-02-16 23:02:29 +02:00
Toms Burgmanis
809432255c Fix hardcoded styles 
Fixed LeftMenuLinkContainer/Wrapper.js using hardcoded values, instead of the ones defined in Themes/Sizes.js.

Signed-off-by: Toms Burgmanis <toms.burgmanis@gmail.com>
 2020-02-16 16:49:14 +02:00
Vitalii Tverdokhlib
d4d83fcd56 update ru.json 
sync with last en ( jq -s '.[0] * .[1]' en.json ru.json)

Signed-off-by: vitaliytv <vitaliytv@nitralabs.com>
 2020-02-16 16:31:42 +02:00
okandas
6c0568909b enhancement(Row\Content.js): align plugin icons to the center 
Signed-off-by: okandas <okandasjr@gmail.com>
 2020-02-14 23:07:42 +02:00
cyril lopez
eace3275e4
Merge pull request #5218 from strapi/chore/ctm-remove-redux-saga 
Remove saga from the content manager
 2020-02-13 13:02:30 +01:00
Edaly Ahmed
67f4712fa7 Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr> 
signing off
 2020-02-13 12:38:55 +01:00
cyril lopez
56ab6442dc
Merge branch 'develop' into chore/ctm-remove-redux-saga 2020-02-13 10:17:40 +01:00
cyril lopez
fa4b57e0b8
Merge pull request #5225 from strapi/chore/remove-saga 
Update Onboarding (blue box)
 2020-02-13 10:16:04 +01:00
soupette
11bd6cc0ed Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 07:50:20 +01:00
Jeremy Hermelin
db2fdbe102 admin watcher improvement 
Signed-off-by: Jeremy Hermelin <jerem@pukka.io>
 2020-02-12 13:39:28 -05:00
virginieky
da82757c95
Merge branch 'develop' into chore/remove-saga 2020-02-12 13:58:51 +01:00
virginieky
b21c112de3
Merge branch 'develop' into chore/ctm-remove-redux-saga 2020-02-12 13:58:16 +01:00
Virginie Ky
540830a7a6 Merge branch 'develop' of github.com:strapi/strapi into develop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 13:53:51 +01:00
soupette
081bdb613f Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-12 10:46:44 +01:00
soupette
f5a2ddc98d Merge branch 'chore/ctm-remove-redux-saga' of github.com:strapi/strapi into chore/ctm-remove-redux-saga 2020-02-12 10:37:19 +01:00