11408 Commits

Author SHA1 Message Date
Andreas Pfurtscheller
aff59ab0d0 Fix production.html
Remove supposedly misplaced script tag

Signed-off-by: Andreas Pfurtscheller <andreas.pfurtscheller@penflock.com>
2020-01-21 23:34:28 +01:00
soupette
d0c3a0ddb7 Merge branch 'chore/eslint-config-front' of github.com:strapi/strapi into chore/eslint-config-front 2020-01-21 18:36:20 +01:00
soupette
489c7b2324 Fix lint
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 18:34:27 +01:00
Virginie Ky
bfbfb36b5a webhooks leftmenu scrollbar
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-21 18:18:28 +01:00
Virginie Ky
2dd1107a6a scrollbar ui
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-21 18:17:21 +01:00
virginieky
221fbbcb3c
Merge branch 'master' into webhooks/tests 2020-01-21 18:15:44 +01:00
cyril lopez
b5f2824f6d
Merge branch 'master' into chore/eslint-config-front 2020-01-21 18:00:52 +01:00
cyril lopez
2220faef2b
Merge pull request #5040 from strapi/fix/date-display
Fix timestamp display
2020-01-21 18:00:28 +01:00
soupette
cd03d672c2 Fix lint
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 17:53:21 +01:00
Virginie Ky
00b664ea61 headersInput tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-21 17:29:39 +01:00
cyril lopez
a6ac47afd9
Merge branch 'master' into chore/ctb-front-end-tests 2020-01-21 17:24:27 +01:00
soupette
ca1e82337c Fixes #5019
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 17:09:03 +01:00
soupette
c2f238fabc Add new line before if rule
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 16:44:57 +01:00
soupette
eb00b7e0ea Add newline-before-return rule
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 16:31:05 +01:00
soupette
2a4351794b Fix lint webhooks
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 16:25:14 +01:00
soupette
b3ba8c27ef Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 16:12:46 +01:00
Virginie Ky
dfd6c51ca8 Merge branch 'master' of github.com:strapi/strapi into webhooks/tests 2020-01-21 16:06:28 +01:00
Virginie Ky
06d05014bd headersinput tests ip
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-21 16:06:05 +01:00
soupette
f50f89f0a8 Update eslint configuration
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-21 16:03:31 +01:00
Virginie Ky
b176ee3589 EditView and ListView reducers
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-21 15:50:31 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 v3.0.0-beta.18.5 2020-01-21 15:44:44 +01:00
Alexandre BODIN
23f7af19f6
Merge pull request #5015 from adcar/patch-1
Fix typo invalid date format
2020-01-21 15:16:37 +01:00
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