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

7915 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
Jim LAURIE
489d2e33fd feat: expose mongoose connections 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-10 15:09:59 +01:00
soupette
b86b584539 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-10 10:24:12 +01:00
Alexandre BODIN
c52966f4e1 Merge branch 'master' into fix/self-referencing-many-way 2020-02-10 09:02:47 +01:00
soupette
d2e2cc9356 Fixes #3914 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-07 16:36:55 +01:00
soupette
d58cbdc3c4 Fixes #5091 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-07 15:55:23 +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
015b4a5e23
Merge branch 'master' into fix/findUserByProvider 2020-02-07 10:10:30 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
Fredrik Söderquist
52e6d33f0e Match provider when logging in, to make sure the right user is found 
Signed-off-by: Fredrik Söderquist <fregu808@gmail.com>
 2020-02-06 21:14:36 +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
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
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
6fff7fcf46 Merge branch 'develop' into features/single-types 2020-02-06 14:11:44 +01:00
soupette
d8f0edf5b1 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-06 12:05:17 +01:00
soupette
7adc97b269 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-06 11:54:02 +01:00
HichamELBSI
98871fcb46 Merge branch 'develop' into features/single-types 2020-02-05 16:41:30 +01:00
virginieky
7904c171dc
Merge branch 'master' into fix/select-relations 2020-02-04 14:08: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
soupette
24630ebd02 Remove snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 16:51:35 +01:00
soupette
6cf54385ca Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 16:43:12 +01:00
soupette
b6d0c5dc7b Add snaps back 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 16:06:16 +01:00
soupette
c86e1dfb18 Update front-end jest config 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 16:03:36 +01:00
soupette
451589f875 Upgrade buffet.js with the next version 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 15:43:44 +01:00
soupette
f74082af33 Upgrade to styled-compo v5 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 15:36:59 +01:00
soupette
5e9af4c36c Remove styled-compo dependency from content manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 15:34:44 +01:00
soupette
c91254b1aa Remove snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 15:31:08 +01:00
soupette
f3c6472f4a Update snap 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 11:51:23 +01:00
cyril lopez
89ee8df680
Merge branch 'develop' into core/admin-settings-api 2020-02-03 11:39:10 +01:00
cyril lopez
a2b021f7d0
Merge branch 'master' into fix/select-relations 2020-01-31 21:06:45 +01:00
Alexandre Bodin
349b28c291 Merge branch 'master' into develop 2020-01-31 18:21:42 +01:00
soupette
86a411812f Update snapshots required since new component logic 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-31 17:30:42 +01:00
soupette
3473143813 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-31 17:14:24 +01:00
HichamELBSI
9e9d7382c4 Single types creation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-01-31 17:13:12 +01:00
soupette
063443b94d Merge branch 'master' of github.com:strapi/strapi into develop 2020-01-31 17:10:43 +01:00
HichamELBSI
3770999193 Fix content type modal 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-01-31 17:02:40 +01:00
Alexandre Bodin
283a0db1ed Upgrade rimraf 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-31 16:56:50 +01:00
Alexandre Bodin
58338821b4 Fix chokidar version conflicts 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-31 16:54:29 +01:00
Virginie Ky
9c67340e42 Merge branch 'master' into develop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-31 15:19:53 +01:00
Virginie Ky
bb9ff9e47a Merge branch 'master' into develop 2020-01-31 15:10:07 +01:00
Virginie Ky
15eabaff39 add index to editview utils 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-31 14:37:28 +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
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
Virginie Ky
2af7111289 invert values in EventInput formatValue unit test 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-30 18:44:01 +01:00
HichamELBSI
7622874fb0 Fix translations 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-01-30 18:26:35 +01:00