yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 18:33:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,868 Commits 121 Branches 507 Tags
Commit Graph

1358 Commits

Author SHA1 Message Date
soupette
7b752d1ce3 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-17 07:54:37 +01:00
virginieky
10ba8df9db
Merge branch 'front/ui-improvements' into front/checkbox-description 2020-02-13 18:21:10 +01:00
Virginie Ky
054afad9e4 align the entire DOM 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 17:20:57 +01:00
virginieky
8d36b69507
Merge branch 'front/ui-improvements' into front/font-weight 2020-02-13 13:46:49 +01:00
Virginie Ky
138bbae981 generalize all trash icons 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 11:29:01 +01:00
soupette
4a344d1212 Created HeaderSearch component and add it to the ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 10:02:45 +01:00
soupette
be4954a7e8 Move Filter icon in helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 09:39:20 +01:00
Virginie Ky
7e5a0fb665 update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 15:55:27 +01:00
Virginie Ky
6bf218abbf clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-11 17:18:12 +01:00
Virginie Ky
45ecaec15c font-weight and alignment 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-11 17:12:40 +01:00
HichamELBSI
f534ec32a9 Update list item limitation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-07 14:48:32 +01:00
Virginie Ky
59e54fee2d update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-06 18:19:25 +01:00
HichamELBSI
bd284f0637 Fix list max height 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-06 16:00:49 +01:00
Virginie Ky
8eb12811aa Merge branch 'front/ui-improvements' into front/popupwarning 2020-02-06 14:38:59 +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
Virginie Ky
c1c56b4b36 Unit tests & snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-05 16:04:26 +01:00
Virginie Ky
fb9d960a63 Merge branch 'front/ui-improvements' into front/popupwarning 2020-02-04 14:07:04 +01:00
Virginie Ky
232131faac update snapshots waiting for jest config 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-04 09:56:50 +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
Virginie Ky
995ba8d8b3 popup warning snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-31 19:04:49 +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
Virginie Ky
6d5a4042b1 Merge branch 'front/ui-improvements' into front/popupwarning 2020-01-31 15:17:33 +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
7830474672 Merge branch 'front/ui-improvements' into front/popupwarning 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-29 14:38:48 +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
Virginie Ky
39bf80a6dc Popup warning UI 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-28 17:54:01 +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