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

1239 Commits

Author SHA1 Message Date
HichamELBSI
f534ec32a9 Update list item limitation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-07 14:48:32 +01:00
HichamELBSI
bd284f0637 Fix list max height 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-06 16:00:49 +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
HichamELBSI
98871fcb46 Merge branch 'develop' into features/single-types 2020-02-05 16:41:30 +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
cyril lopez
89ee8df680
Merge branch 'develop' into core/admin-settings-api 2020-02-03 11:39:10 +01:00
soupette
3473143813 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-31 17:14:24 +01:00
Alexandre Bodin
283a0db1ed Upgrade rimraf 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-31 16:56:50 +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
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
f6d8f51df3 Fix link default message 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 17:38:25 +01:00
virginieky
5acbb26573
Merge branch 'master' into webhooks/tests 2020-01-30 17:03:27 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
soupette
144d07cdbe Improve plugin left menu for trads and enable settings api 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 11:50:34 +01:00
Virginie Ky
baf74d41b3 Merge branch 'master' into webhooks/tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-28 18:20:21 +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
virginieky
87b62706f9
Merge branch 'master' into webhooks/tests 2020-01-23 15:17:37 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Virginie Ky
bfbfb36b5a webhooks leftmenu scrollbar 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-21 18:18:28 +01:00
Virginie Ky
2dd1107a6a scrollbar ui 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-21 18:17:21 +01:00
Virginie Ky
00b664ea61 headersInput tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-21 17:29:39 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 2020-01-21 15:44:44 +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
d98215c10b clean code 2020-01-10 15:17:36 +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
df1fed99ec docs: update copyright date to 2020 2020-01-08 15:41:08 +01:00
Virginie Ky
8ba3e462e4 Review apply ip 2020-01-08 14:55:37 +01:00
Alexandre Bodin
f0028241c8 v3.0.0-beta.18.4 2020-01-07 17:00:28 +01:00
Virginie Ky
a094a322af EditView UI 2020-01-03 15:54:53 +01:00
Alexandre Bodin
c2650b085c v3.0.0-beta.18.3 2019-12-23 10:17:40 +01:00
Alexandre Bodin
8586b3dd39 v3.0.0-beta.18.2 2019-12-19 11:17:14 +01:00
soupette
a54d207340 Add step any and add input text for biginteger type in the content type builder 2019-12-18 17:03:35 +01:00
Alexandre Bodin
8e2fb1ff1a v3.0.0-beta.18.1 2019-12-18 09:05:32 +01:00
Alexandre Bodin
09629c11e8 v3.0.0-beta.18 2019-12-17 14:55:58 +01:00
soupette
9f28c6b8c2 Fix conflicts 2019-12-17 10:20:03 +01:00
Virginie Ky
3d570a41f5 pr review apply 2019-12-17 00:12:50 +01:00
Virginie Ky
7b28ebe3b5 EmptyList 2019-12-16 23:54:32 +01:00
Virginie Ky
3226e0c59e PR review apply 2019-12-16 21:53:16 +01:00
soupette
9e64bc095a Fix NotFound compo 2019-12-16 17:38:19 +01:00
soupette
28986d26cc Fixes #4429 2019-12-13 18:11:34 +01:00
Virginie Ky
4998ab15ce ListView 2019-12-12 17:11:28 +01:00
soupette
33288b0bd4 Fix getInjectedComponents and ctm events from ctb 2019-12-12 15:02:06 +01:00
soupette
92ecb3eccd Fix leftmenu count span 2019-12-11 10:31:19 +01:00
soupette
98519d4f97 Remove commented code 2019-12-10 16:31:54 +01:00