Alexandre Bodin
|
9c96b180fe
|
Merge branch 'develop' into features/single-types
|
2020-01-22 10:39:42 +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 |
|
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 |
|
soupette
|
ca1e82337c
|
Fixes #5019
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 17:09:03 +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 |
|
soupette
|
f50f89f0a8
|
Update eslint configuration
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 16:03:31 +01:00 |
|
Alexandre Bodin
|
2ee13c0a12
|
v3.0.0-beta.18.5
|
2020-01-21 15:44:44 +01:00 |
|
Alexandre Bodin
|
cd4f873be6
|
Add testing
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-01-21 12:32:37 +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
|
1d05cc01b2
|
Merge branch 'develop' into features/webhooks
|
2020-01-20 17:21:14 +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 |
|
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 |
|
cyril lopez
|
b76cdb10bb
|
Merge pull request #5014 from strapi/front/webhooks-editview
Front/webhooks editview
|
2020-01-20 10:25:21 +01:00 |
|
Ky
|
588d472ee2
|
layout icon fix
Signed-off-by: Ky <virginie.ky@gmail.com>
|
2020-01-19 17:58:41 +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 |
|
cyril lopez
|
7ccd012ada
|
Merge pull request #4962 from strapi/front/webhooks-editview
Front/webhooks editview
|
2020-01-17 18:59:50 +01:00 |
|
Alexandre Bodin
|
ab8d2c5d77
|
Merge branch 'develop' into features/webhooks
|
2020-01-16 16:55:27 +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
|
7f60f6eb57
|
Apply PR review
|
2020-01-15 12:17:44 +01:00 |
|
Virginie Ky
|
e250ac81d5
|
Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview
|
2020-01-13 18:14:27 +01:00 |
|
Alexandre Bodin
|
14d95f3de1
|
erge branch 'develop' into features/webhooks
|
2020-01-13 12:22:21 +01:00 |
|
soupette
|
bfe37c73c9
|
Fix conflicts
|
2020-01-13 11:39:08 +01:00 |
|
Virginie Ky
|
fb7017c3ea
|
Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview
|
2020-01-13 10:19:14 +01:00 |
|
Alexandre Bodin
|
dcc29b361b
|
Merge branch 'develop' into features/webhooks
|
2020-01-13 09:41:20 +01:00 |
|
virginieky
|
50643f94b3
|
Merge branch 'master' into chore/eslint-config
|
2020-01-10 17:44:43 +01:00 |
|
Virginie Ky
|
4aeb5399ee
|
Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview
|
2020-01-09 11:11:32 +01:00 |
|
Alexandre Bodin
|
f28292b384
|
Merge branch 'develop' into features/webhooks
|
2020-01-09 11:09:26 +01:00 |
|
Virginie Ky
|
d0650f1884
|
Conflicts resolved
|
2020-01-09 11:05:46 +01:00 |
|
Alexandre BODIN
|
a427c27cfd
|
Merge pull request #4947 from strapi/fix/use-strapi-service
Use strapi.services instead of requires to allow overrides
|
2020-01-09 10:13:05 +01:00 |
|
Alexandre Bodin
|
7c94a2316d
|
Init strapi.service and use it where services where required
|
2020-01-08 17:57:53 +01:00 |
|
Virginie Ky
|
47e1031e29
|
Reviex apply in progress
|
2020-01-08 16:08:58 +01:00 |
|
Jim LAURIE
|
df1fed99ec
|
docs: update copyright date to 2020
|
2020-01-08 15:41:08 +01:00 |
|
Jim LAURIE
|
2b2295ee78
|
Merge branch 'master' into feature/adminTranslationCs
|
2020-01-08 15:34:16 +01:00 |
|
Alexandre Bodin
|
a0718d7643
|
Fix delete many
|
2020-01-08 13:25:44 +01:00 |
|
soupette
|
c62dad2140
|
Improve eslint config fron front-end files
|
2020-01-08 12:21:47 +01:00 |
|
Alexandre Bodin
|
fb25e33383
|
Create an entity service to share between core service and content manager
|
2020-01-08 11:13:38 +01:00 |
|
Alexandre BODIN
|
b44e4a9f64
|
Merge branch 'master' into hotfix/ctm-yup-schema
|
2020-01-08 10:51:12 +01:00 |
|
soupette
|
1e87172073
|
Fix PR feedback
|
2020-01-08 10:29:41 +01:00 |
|
Jaroslav Vrána
|
0215f64648
|
Merge branch 'master' into feature/adminTranslationCs
|
2020-01-07 19:32:32 +01:00 |
|
Jaroslav Vrána
|
91b0f5a990
|
Merge pull request #2 from profispojka/feature/adminTranslationCsWithPlugins
Feature/admin translation cs with plugins
|
2020-01-07 19:27:17 +01:00 |
|
virginieky
|
52d25bef3e
|
Merge branch 'master' into ctm/improve-listview
|
2020-01-07 17:51:07 +01:00 |
|
Alexandre Bodin
|
f0028241c8
|
v3.0.0-beta.18.4
|
2020-01-07 17:00:28 +01:00 |
|
soupette
|
b399a9a26c
|
Merge branch 'master' of github.com:strapi/strapi into hotfix/ctm-yup-schema
|
2020-01-07 14:55:56 +01:00 |
|
soupette
|
71237608a1
|
Improve component validation test
|
2020-01-07 14:55:27 +01:00 |
|
soupette
|
376e60331a
|
Fix yup schema for component with min and max validations
|
2020-01-07 12:14:41 +01:00 |
|
Jozef Cipa
|
61972f6292
|
Merge branch 'master' into feature/slovak-translations
|
2020-01-06 18:22:48 +01:00 |
|