yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 20:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,408 Commits 117 Branches 489 Tags
Commit Graph

1570 Commits

Author SHA1 Message Date
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
d2e2cc9356 Fixes #3914 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-07 16:36:55 +01:00
HichamELBSI
f534ec32a9 Update list item limitation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-07 14:48:32 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
HichamELBSI
bd284f0637 Fix list max height 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-06 16:00:49 +01:00
HichamELBSI
fe46e9ac10 Add restriction to relation attribute 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-06 15:31:46 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
HichamELBSI
d2dc5735e4 Update after requested changes 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-06 14:19:06 +01:00
HichamELBSI
abbb045277 Edit single type options 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-06 14:13:48 +01:00
HichamELBSI
98871fcb46 Merge branch 'develop' into features/single-types 2020-02-05 16:41:30 +01:00
ruibaby
ff489ce051 feat: updated zh-Hans translations. 
Signed-off-by: ruibaby <i@ryanc.cc>
 2020-02-04 15:55:02 +08:00
HichamELBSI
9e9d7382c4 Single types creation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-01-31 17:13:12 +01:00
HichamELBSI
3770999193 Fix content type modal 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-01-31 17:02:40 +01:00
Virginie Ky
bb9ff9e47a Merge branch 'master' into develop 2020-01-31 15:10:07 +01:00
Hicham EL ABBASSI
73db8d428b Single types list in CTB 
Signed-off-by: Hicham EL ABBASSI <hichamelabbassi@MacBook-Pro-de-Hicham.local>
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-01-31 09:59:11 +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
Alexandre Bodin
5d1565bdd3 Merge branch 'master' of github.com:strapi/strapi 2020-01-30 16:19:21 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
cyril lopez
eb6fc3578d
Merge branch 'master' into fix/5038 2020-01-30 15:41:27 +01:00
Alexandre Bodin
576279626b Merge branch 'develop' into features/single-types 2020-01-29 11:59:53 +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
Hicham EL ABBASSI
81c5537d7f Merge branch 'develop' into features/single-types 2020-01-29 10:09:46 +01:00
Alexandre Bodin
4f5a0e7679 Cleanup eslint configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 10:49:57 +01:00
soupette
0b81207d74 Merge branch 'master' of github.com:strapi/strapi into fix/5038 2020-01-27 09:43:49 +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
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +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
a9c9549458 Fixes #5038 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-22 12:14:17 +01:00
Alexandre Bodin
929eea0f55 Merge branch 'features/single-types' into single-types/generate-single-type-api 2020-01-22 12:05:57 +01:00
Alexandre Bodin
7a9c481d59 Merge branch 'develop' into features/single-types 2020-01-22 12:05:46 +01:00
Alexandre Bodin
958db137df Generate route.json based on content type kind 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-22 11:29:37 +01:00
Alexandre Bodin
9c96b180fe Merge branch 'develop' into features/single-types 2020-01-22 10:39:42 +01:00
soupette
be64adaa1c Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-22 10:29:36 +01:00
soupette
489c7b2324 Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 18:34:27 +01:00
cyril lopez
a6ac47afd9
Merge branch 'master' into chore/ctb-front-end-tests 2020-01-21 17:24:27 +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
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
virginieky
f76e33cba1
Merge branch 'master' into chore/ctb-front-end-tests 2020-01-21 12:21:20 +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
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
virginieky
f6f573445c
Merge branch 'master' into chore/ctb-front-end-tests 2020-01-20 16:59:52 +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