1168 Commits

Author SHA1 Message Date
HichamELBSI
4f5cd5a209 Reskin and refacto the left admin menu and add Single type section
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2020-02-11 17:13:31 +01:00
Alexandre Bodin
de9521ce6b Merge branch 'develop' into features/single-types
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-02-10 21:09:50 +01:00
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-02-10 19:15:20 +01:00
soupette
b86b584539 Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-10 10:24:12 +01:00
soupette
d58cbdc3c4 Fixes #5091
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-07 15:55:23 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
cyril lopez
3a8e79817f
Merge branch 'develop' into fix/select-relations 2020-02-06 15:16:31 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
ruibaby
ff489ce051 feat: updated zh-Hans translations.
Signed-off-by: ruibaby <i@ryanc.cc>
2020-02-04 15:55:02 +08:00
Hicham EL ABBASSI
90a60879c5 Update all translations
Signed-off-by: Hicham EL ABBASSI <hichamelabbassi@MacBook-Pro-de-Hicham.local>
2020-01-31 09:59:10 +01:00
HichamELBSI
7622874fb0 Fix translations
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2020-01-30 18:26:35 +01:00
Hicham EL ABBASSI
597a88a650 Update all translations
Signed-off-by: Hicham EL ABBASSI <hichamelabbassi@MacBook-Pro-de-Hicham.local>
2020-01-30 18:26:35 +01:00
soupette
9c53fcaccc Fix select relations
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-30 18:09:55 +01:00
Alexandre Bodin
b999bea3a9 Merge branch 'master' into develop 2020-01-29 11:59:41 +01:00
Virginie Ky
4ff189ac00 Merge branch 'master' into develop 2020-01-29 11:35:55 +01:00
soupette
96e092b300 Change the way we load plugins
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-23 16:46:50 +01:00
soupette
af4bee9b8e Fixes #5054
Signed-off-by: soupette <>
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-23 15:44:47 +01:00
Mariusz Wachowski
4e5326490e feat: updated pl translations
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
2020-01-22 21:54:08 +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
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
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
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
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
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
Virginie Ky
d0650f1884 Conflicts resolved 2020-01-09 11:05:46 +01:00
Virginie Ky
47e1031e29 Reviex apply in progress 2020-01-08 16:08:58 +01:00
Jim LAURIE
2b2295ee78
Merge branch 'master' into feature/adminTranslationCs 2020-01-08 15:34:16 +01:00
soupette
c62dad2140 Improve eslint config fron front-end files 2020-01-08 12:21:47 +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
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