33691 Commits

Author SHA1 Message Date
Alexandre BODIN
c61a007d3e
Merge pull request #4950 from thomb/strapi-thomb-upgrade-purest
Upgrade purest to 3.x
2020-01-21 14:27:52 +01:00
Alexandre BODIN
bab82c864c
Merge branch 'master' into strapi-thomb-upgrade-purest 2020-01-21 14:26:51 +01:00
Alexandre BODIN
2048e38552
Merge pull request #5030 from strapi/develop
Feature webhooks
2020-01-21 14:21:08 +01:00
Alexandre BODIN
0873e659c5
Merge pull request #5031 from strapi/webhooks/doc
Webhooks doc
2020-01-21 13:01:10 +01:00
Alexandre BODIN
36639e3fef
Merge branch 'develop' into webhooks/doc 2020-01-21 13:00:56 +01:00
Alexandre BODIN
a385b90090
Merge pull request #5037 from strapi/single-types/ctm-st-support
Single type support in entity-service
2020-01-21 12:34:37 +01:00
Alexandre Bodin
cd4f873be6 Add testing
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-21 12:32:37 +01:00
virginieky
f76e33cba1
Merge branch 'master' into chore/ctb-front-end-tests 2020-01-21 12:21:20 +01:00
Alexandre Bodin
f933e869f1 Remove old webhook guide
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-21 12:16:38 +01:00
Alexandre Bodin
1d8217a66b Update webhook doc
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-21 11:57:49 +01:00
Alexandre Bodin
98570f0663 Support single types in entity service
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-21 11:46:39 +01:00
Alexandre Bodin
90408d5119 content-manager: list content types on kind
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-21 11:46:38 +01:00
Alexandre Bodin
dce6bd432c Merge branch 'develop' into features/single-types 2020-01-21 11:46:26 +01:00
Alexandre Bodin
daaf1392d2 Merge branch 'master' into develop 2020-01-21 11:46:04 +01:00
soupette
6c27d224f2 Add eslint config
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 11:33:43 +01:00
Alexandre Bodin
878b4f3495 Add codecov to disable comments on non master PRs
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-21 11:13:17 +01:00
Alexandre BODIN
a260bcfe80
Merge pull request #5018 from nurikabe/master
fix: enfore RFC-822 for email from parameter
2020-01-21 10:40:05 +01:00
Alexandre BODIN
4bebeb7d6d
Merge branch 'master' into master 2020-01-21 10:39:37 +01:00
Alexandre BODIN
b52792bfee
Merge pull request #4949 from pataiadam/fix/remove-auto-populate
fix: keep autoPopulate options on content type update
2020-01-21 10:36:15 +01:00
Alexandre BODIN
4cfaad4940
Merge branch 'master' into fix/remove-auto-populate 2020-01-21 10:35:46 +01:00
Virginie Ky
1858970217 ListView reducer tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-21 10:31:12 +01:00
virginieky
ef69d81696
Merge branch 'master' into chore/ctb-front-end-tests 2020-01-21 10:08:03 +01:00
Virginie Ky
dde98e4ae8 unit test ip
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-20 18:48:06 +01:00
Alexandre BODIN
da5e57bf8a
Merge pull request #5027 from strapi/fix-graphql-role-query
Fix get role via GraphQL
2020-01-20 18:43:54 +01:00
Alexandre Bodin
6986948c81 Update webhook doc with screenshots
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-20 18:01:01 +01:00
Alexandre Bodin
323e76b5f3 Merge branch 'develop' into features/single-types
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-20 17:33:58 +01:00
Alexandre BODIN
4a6afb3462
Merge pull request #5029 from strapi/features/webhooks
Feature webhooks
2020-01-20 17:21:44 +01:00
Alexandre BODIN
1d05cc01b2
Merge branch 'develop' into features/webhooks 2020-01-20 17:21:14 +01:00
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