11408 Commits

Author SHA1 Message Date
Alexandre BODIN
5895d8d357
Merge branch 'master' into fix-graphql-role-query 2020-01-20 17:12:36 +01:00
virginieky
c85ed7a6f6
Merge pull request #5025 from strapi/review/functionnal
Review/functionnal
2020-01-20 17:01:20 +01:00
Jim LAURIE
8027b135e1 fix: fix get role via graphql
Find one role issue due to params sharing in the GraphQL schema.
fix #5013
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
2020-01-20 17:00:20 +01:00
virginieky
f6f573445c
Merge branch 'master' into chore/ctb-front-end-tests 2020-01-20 16:59:52 +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
b2e21fba1d Merge branch 'develop' into features/single-types 2020-01-20 16:27:35 +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
97af06ebf7 test ip
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-20 16:02:48 +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
Alexandre Bodin
3fa75d78b9 Add headers info to webhooks doc
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-20 15:22:36 +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
f80ccccea2 Remove programmatic use for now
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-20 15:13:30 +01:00
Alexandre Bodin
68028d64b4 Add event key
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-20 15:13:30 +01:00
Alexandre Bodin
18ba8b681a Add available configurations
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-20 15:13:29 +01:00
Alexandre Bodin
ca0584eb26 Add default secure webhooks doc
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-20 15:13:29 +01:00
Alexandre Bodin
4ffcd0cffc Init webhooks documentation
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-20 15:13:29 +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
Virginie Ky
60097fcccb tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-20 14:30:22 +01:00
Virginie Ky
6ef313894c listview reducer tests ip
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-20 12:28:06 +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
soupette
3e8a25a599 Add plugin development doc
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-20 09:37:50 +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
nurikabe
4ab268b134 RFC-822 doesn't require double quotes around the descriptive name in an email address 2020-01-18 16:39:27 -05:00
Evan Owens
0c31bbc7aa
Merge pull request #1 from strapi/master
Sync
2020-01-18 15:40:46 -05: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
Alexander D. Cardosi
2761445aa0 Fix typo
Fix a small typo

Signed-off-by: adcar <alexanderdcardosi@gmail.com>
2020-01-17 19:38:00 -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