yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-26 15:41:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,049 Commits 118 Branches 505 Tags
Commit Graph

11049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
1d05cc01b2
Merge branch 'develop' into features/webhooks 2020-01-20 17:21:14 +01:00
virginieky
c85ed7a6f6
Merge pull request #5025 from strapi/review/functionnal 
Review/functionnal
 2020-01-20 17:01:20 +01:00
cyril lopez
7f5a780715
Merge pull request #5024 from strapi/fix/ctm-error 
Fix icons when error state, improve drag experience
 2020-01-20 16:55:00 +01:00
Virginie Ky
3747f3e516 media update disabled comment 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 16:43:37 +01:00
Virginie Ky
f47523302c Disabled events 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 16:31:56 +01:00
Alexandre Bodin
f38ff0c801 Merge branch 'develop' into features/webhooks 2020-01-20 16:27:12 +01:00
soupette
6960a0c7a6 Merge branch 'master' of github.com:strapi/strapi into fix/ctm-error 2020-01-20 16:22:51 +01:00
soupette
3d5b224183 Rename prop to isNested for better understanding 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-20 16:22:43 +01:00
Alexandre BODIN
82501cd6c5
Merge pull request #4999 from strapi/docs-post-schedule 
Add schedule article guide
 2020-01-20 16:12:32 +01:00
Alexandre BODIN
363ea6bb39
Merge branch 'master' into docs-post-schedule 2020-01-20 16:12:07 +01:00
Virginie Ky
bfe0cf321e remove onblur 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 15:59:25 +01:00
Jim LAURIE
408b70971a
Merge pull request #5017 from MatWrz/master 
Add scheduling parameters to SendGrid Provider
 2020-01-20 15:53:38 +01:00
Jim LAURIE
d8d9c23b54
Merge branch 'master' into master 2020-01-20 15:53:23 +01:00
Jim LAURIE
79eda9b015 docs: change guide title 2020-01-20 15:44:47 +01:00
Virginie Ky
8b4886515c events errors 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 15:25:34 +01:00
Virginie Ky
b828f06add trigger button headers errors and notification translation 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 15:22:30 +01:00
soupette
cb5a713283 Merge branch 'master' of github.com:strapi/strapi into fix/ctm-error 2020-01-20 15:18:23 +01:00
soupette
8147a188ed Fix icons when error state, improve drag experience 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-20 15:16:55 +01:00
Alexandre BODIN
99962d68d1
Merge pull request #5023 from strapi/docs-patch-slug 
Fix slug guide
 2020-01-20 14:48:06 +01:00
Jim LAURIE
93a78f198b
Fix slug guide 
Referts to @abdonrd comment on PR #4398
 2020-01-20 14:41:10 +01:00
cyril lopez
b76cdb10bb
Merge pull request #5014 from strapi/front/webhooks-editview 
Front/webhooks editview
 2020-01-20 10:25:21 +01:00
Virginie Ky
bb22226a86 log clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 09:58:07 +01:00
Ky
588d472ee2 layout icon fix 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-01-19 17:58:41 +01:00
Ky
665512e656 actions fix 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-01-19 17:11:24 +01:00
Mathieu Wrzesien
8f8092209b Add scheduling parameters to SendGrid Provider 
Signed-off-by: Mathieu Wrzesien <mathieu.wrzesien@outlook.com>
 2020-01-17 23:06:06 -05:00
Virginie Ky
0764448c75 eslint dep disable fix 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 20:34:02 +01:00
Virginie Ky
bc0d0afcd1 eslint dep disable fix 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 20:32:50 +01:00
Virginie Ky
9ebc543bdd eslint dep 2020-01-17 20:27:16 +01:00
Virginie Ky
249bfbdde9 remove abortcontroller dep 2020-01-17 20:23:03 +01:00
Virginie Ky
f36b1c6288 remove events onblur effect 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 20:20:57 +01:00
cyril lopez
7ccd012ada
Merge pull request #4962 from strapi/front/webhooks-editview 
Front/webhooks editview
 2020-01-17 18:59:50 +01:00
Virginie Ky
af578e9df7 log remove 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 18:21:26 +01:00
Virginie Ky
2753a66315 editview methods reorder 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 17:28:46 +01:00
Virginie Ky
e444cf0119 events input ref 2020-01-17 17:20:27 +01:00
Virginie Ky
27786d1d1f event onblur fix 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 13:37:21 +01:00
Alexandre BODIN
3cb7810d69
Merge pull request #5009 from strapi/docs-fix-typo 
Fixe documentation typo provider
 2020-01-17 11:09:04 +01:00
Jim LAURIE
ceb97360f7 docs: fixe type provider 
close #5007
 2020-01-16 21:28:20 +01:00
Virginie Ky
84d042736d Code review apply 2020-01-16 18:17:30 +01:00
Alexandre Bodin
ab8d2c5d77 Merge branch 'develop' into features/webhooks 2020-01-16 16:55:27 +01:00
Alexandre BODIN
ff1b249d31
Merge pull request #5006 from strapi/chore/test-scripts 
Refactor tests and add codecov
 2020-01-16 16:54:55 +01:00
Alexandre Bodin
9eca5aa14e Fix typo 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 16:50:43 +01:00
Virginie Ky
4add71d56b CTB sublist button UI fix 2020-01-16 15:26:30 +01:00
Alexandre Bodin
9d8e285c55 Add --coverage option 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 15:16:46 +01:00
Alexandre Bodin
fbfd61122d Fix codecov option 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 15:03:13 +01:00
Alexandre Bodin
3f55adc34e Improve publish script 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 14:51:55 +01:00
Virginie Ky
662b9fed0c Error object for custom input 2020-01-16 14:40:37 +01:00
Alexandre Bodin
0674bbd95c Clear coverage after sending 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 14:30:29 +01:00
Alexandre Bodin
3bca612ac1 Refactor tests and add codecov 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 14:06:03 +01:00
Virginie Ky
e6b4f421d7 reorder main files elements 2020-01-16 11:00:38 +01:00
Virginie Ky
87a51983ac dept exception 2020-01-15 18:28:33 +01:00