Virginie Ky
|
ab85b7642e
|
Merge branch 'webhooks/tests' of github.com:strapi/strapi into webhooks/tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-22 18:11:12 +01:00 |
|
Virginie Ky
|
22fa1a963a
|
snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-22 17:47:09 +01:00 |
|
cyril lopez
|
51c33144c6
|
Merge branch 'master' into webhooks/tests
|
2020-01-22 17:26:29 +01:00 |
|
virginieky
|
a501cc817d
|
Merge branch 'master' into webhooks/leftmenu-scrollbar
|
2020-01-22 14:28:41 +01:00 |
|
soupette
|
be64adaa1c
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-22 10:29:36 +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 |
|
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
|
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
|
bab82c864c
|
Merge branch 'master' into strapi-thomb-upgrade-purest
|
2020-01-21 14:26:51 +01:00 |
|
virginieky
|
f76e33cba1
|
Merge branch 'master' into chore/ctb-front-end-tests
|
2020-01-21 12:21:20 +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
|
4bebeb7d6d
|
Merge branch 'master' into master
|
2020-01-21 10:39:37 +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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Virginie Ky
|
60097fcccb
|
tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-20 14:30:22 +01:00 |
|