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

1010 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
soupette
96e092b300 Change the way we load plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-23 16:46:50 +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
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
soupette
6ea595110b Apply PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-16 16:08:39 +01:00
Virginie Ky
4add71d56b CTB sublist button UI fix 2020-01-16 15:26:30 +01:00
soupette
da4c9d5330 Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests 2020-01-15 14:50:43 +01:00
soupette
451e1e6de8 Add tests for FormModal reducer 2020-01-15 14:47:54 +01:00
soupette
16a6975af1 Fix add compo to dz action 2020-01-15 12:35:26 +01:00
soupette
e13e8e242b Add tests for internal relations 2020-01-15 12:01:05 +01:00
soupette
7c7813a787 Init relations tests 2020-01-14 17:14:46 +01:00
soupette
1f85288c63 Add tests for removing a field from a content type 2020-01-14 16:01:27 +01:00
soupette
3db763340c Add tests for all relations 2020-01-14 15:30:14 +01:00
soupette
1e3c3d9736 Add test for adding a relation with another ct 2020-01-14 15:01:43 +01:00
soupette
c577097994 Add test for adding a compo and a dz 2020-01-14 12:31:39 +01:00
soupette
0a2dffc1d4 Fix conflicts 2020-01-14 09:35:34 +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
soupette
60cd11624a Add test for adding a common attribute 2020-01-08 17:57:25 +01:00
soupette
c259377bd2 Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests 2020-01-08 17:20:06 +01:00